From 16e83e51aaeb3c920fd3c766fa3f6921a9f63727 Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Thu, 11 Jan 2018 12:01:50 -0700 Subject: [PATCH] Rename core module to server This is related to #27933. It renames the core module to server. This is the first step towards introducing an elasticsearch-core jar. --- build.gradle | 10 +- .../gradle/precommit/PrecommitTasks.groovy | 2 +- .../resources/checkstyle_suppressions.xml | 1412 ++++++++--------- ...ignatures.txt => es-server-signatures.txt} | 0 buildSrc/version.properties | 6 +- client/rest/build.gradle | 6 +- client/sniffer/build.gradle | 8 +- client/test/build.gradle | 2 +- distribution/build.gradle | 10 +- docs/build.gradle | 4 +- {core => server}/build.gradle | 8 +- {core => server}/cli/build.gradle | 2 +- .../cli/licenses/jopt-simple-5.0.2.jar.sha1 | 0 .../cli/licenses/jopt-simple-LICENSE.txt | 0 .../cli/licenses/jopt-simple-NOTICE.txt | 0 .../java/org/elasticsearch/cli/Command.java | 0 .../java/org/elasticsearch/cli/ExitCodes.java | 0 .../org/elasticsearch/cli/MultiCommand.java | 0 .../elasticsearch/cli/SuppressForbidden.java | 0 .../java/org/elasticsearch/cli/Terminal.java | 0 .../org/elasticsearch/cli/UserException.java | 0 .../licenses/HdrHistogram-2.1.9.jar.sha1 | 0 .../licenses/HdrHistogram-LICENSE.txt | 0 .../licenses/HdrHistogram-NOTICE.txt | 0 .../licenses/apache-log4j-extras-DEPENDENCIES | 0 {core => server}/licenses/hppc-0.7.1.jar.sha1 | 0 {core => server}/licenses/hppc-LICENSE.txt | 0 {core => server}/licenses/hppc-NOTICE.txt | 0 {core => server}/licenses/jackson-LICENSE | 0 {core => server}/licenses/jackson-NOTICE | 0 .../licenses/jackson-core-2.8.10.jar.sha1 | 0 .../jackson-dataformat-cbor-2.8.10.jar.sha1 | 0 .../jackson-dataformat-smile-2.8.10.jar.sha1 | 0 .../jackson-dataformat-yaml-2.8.10.jar.sha1 | 0 {core => server}/licenses/jna-4.5.1.jar.sha1 | 0 {core => server}/licenses/jna-LICENSE.txt | 0 {core => server}/licenses/jna-NOTICE.txt | 0 .../licenses/joda-time-2.9.5.jar.sha1 | 0 .../licenses/joda-time-LICENSE.txt | 0 .../licenses/joda-time-NOTICE.txt | 0 {core => server}/licenses/jts-1.13.jar.sha1 | 0 {core => server}/licenses/jts-LICENSE.txt | 0 {core => server}/licenses/jts-NOTICE.txt | 0 .../licenses/log4j-1.2-api-2.9.1.jar.sha1 | 0 {core => server}/licenses/log4j-LICENSE.txt | 0 {core => server}/licenses/log4j-NOTICE.txt | 0 .../licenses/log4j-api-2.9.1.jar.sha1 | 0 .../licenses/log4j-api-LICENSE.txt | 0 .../licenses/log4j-api-NOTICE.txt | 0 .../licenses/log4j-core-2.9.1.jar.sha1 | 0 .../licenses/log4j-core-LICENSE.txt | 0 .../licenses/log4j-core-NOTICE.txt | 0 {core => server}/licenses/lucene-LICENSE.txt | 0 {core => server}/licenses/lucene-NOTICE.txt | 0 .../lucene-analyzers-common-7.2.0.jar.sha1 | 0 .../lucene-backward-codecs-7.2.0.jar.sha1 | 0 .../licenses/lucene-core-7.2.0.jar.sha1 | 0 .../licenses/lucene-grouping-7.2.0.jar.sha1 | 0 .../lucene-highlighter-7.2.0.jar.sha1 | 0 .../licenses/lucene-join-7.2.0.jar.sha1 | 0 .../licenses/lucene-memory-7.2.0.jar.sha1 | 0 .../licenses/lucene-misc-7.2.0.jar.sha1 | 0 .../licenses/lucene-queries-7.2.0.jar.sha1 | 0 .../lucene-queryparser-7.2.0.jar.sha1 | 0 .../licenses/lucene-sandbox-7.2.0.jar.sha1 | 0 .../licenses/lucene-spatial-7.2.0.jar.sha1 | 0 .../lucene-spatial-extras-7.2.0.jar.sha1 | 0 .../licenses/lucene-spatial3d-7.2.0.jar.sha1 | 0 .../licenses/lucene-suggest-7.2.0.jar.sha1 | 0 .../licenses/securesm-1.2.jar.sha1 | 0 .../licenses/securesm-LICENSE.txt | 0 {core => server}/licenses/securesm-NOTICE.txt | 0 .../licenses/snakeyaml-1.17.jar.sha1 | 0 .../licenses/snakeyaml-LICENSE.txt | 0 .../licenses/snakeyaml-NOTICE.txt | 0 .../licenses/spatial4j-0.6.jar.sha1 | 0 {core => server}/licenses/spatial4j-ABOUT.txt | 0 .../licenses/spatial4j-LICENSE.txt | 0 .../licenses/spatial4j-NOTICE.txt | 0 .../licenses/t-digest-3.0.jar.sha1 | 0 .../licenses/t-digest-LICENSE.txt | 0 {core => server}/licenses/t-digest-NOTICE.txt | 0 .../src/main/eclipse-build.gradle | 0 .../DeDuplicatingTokenFilter.java | 0 .../miscellaneous/DisableGraphAttribute.java | 0 .../DisableGraphAttributeImpl.java | 0 .../DuplicateByteSequenceSpotter.java | 0 .../DuplicateSequenceAttribute.java | 0 .../DuplicateSequenceAttributeImpl.java | 0 .../apache/lucene/document/BinaryRange.java | 0 .../apache/lucene/index/OneMergeHelper.java | 0 .../queries/BinaryDocValuesRangeQuery.java | 0 .../lucene/queries/BlendedTermQuery.java | 0 .../queries/ExtendedCommonTermsQuery.java | 0 .../apache/lucene/queries/MinDocQuery.java | 0 .../queries/SearchAfterSortedDocQuery.java | 0 .../queryparser/classic/XQueryParser.java | 0 .../search/XFilteredDocIdSetIterator.java | 0 .../search/grouping/CollapseTopFieldDocs.java | 0 .../grouping/CollapsingDocValuesSource.java | 0 .../grouping/CollapsingTopDocsCollector.java | 0 .../analyzing/XAnalyzingSuggester.java | 0 .../suggest/analyzing/XFuzzySuggester.java | 0 .../BoundedBreakIteratorScanner.java | 0 .../uhighlight/CustomFieldHighlighter.java | 0 .../uhighlight/CustomPassageFormatter.java | 0 .../uhighlight/CustomUnifiedHighlighter.java | 0 .../lucene/search/uhighlight/Snippet.java | 0 .../vectorhighlight/CustomFieldQuery.java | 0 .../java/org/elasticsearch/Assertions.java | 0 .../main/java/org/elasticsearch/Build.java | 0 .../ElasticsearchCorruptionException.java | 0 .../elasticsearch/ElasticsearchException.java | 0 .../ElasticsearchGenerationException.java | 0 .../ElasticsearchParseException.java | 0 .../ElasticsearchSecurityException.java | 0 .../ElasticsearchStatusException.java | 0 .../ElasticsearchTimeoutException.java | 0 .../ElasticsearchWrapperException.java | 0 .../org/elasticsearch/ExceptionsHelper.java | 0 .../ResourceAlreadyExistsException.java | 0 .../ResourceNotFoundException.java | 0 .../org/elasticsearch/SpecialPermission.java | 0 .../main/java/org/elasticsearch/Version.java | 0 .../java/org/elasticsearch/action/Action.java | 0 .../elasticsearch/action/ActionFuture.java | 0 .../elasticsearch/action/ActionListener.java | 0 .../action/ActionListenerResponseHandler.java | 0 .../elasticsearch/action/ActionModule.java | 0 .../elasticsearch/action/ActionRequest.java | 0 .../action/ActionRequestBuilder.java | 0 .../ActionRequestValidationException.java | 0 .../elasticsearch/action/ActionResponse.java | 0 .../elasticsearch/action/ActionRunnable.java | 0 .../elasticsearch/action/AliasesRequest.java | 0 .../action/CompositeIndicesRequest.java | 0 .../elasticsearch/action/DocWriteRequest.java | 0 .../action/DocWriteResponse.java | 0 .../action/FailedNodeException.java | 0 .../elasticsearch/action/GenericAction.java | 0 .../elasticsearch/action/IndicesRequest.java | 0 .../action/LatchedActionListener.java | 0 .../action/ListenableActionFuture.java | 0 .../NoShardAvailableActionException.java | 0 .../action/NoSuchNodeException.java | 0 .../action/NotifyOnceListener.java | 0 .../elasticsearch/action/OriginalIndices.java | 0 .../action/PrimaryMissingActionException.java | 0 .../elasticsearch/action/RealtimeRequest.java | 0 .../action/RoutingMissingException.java | 0 .../action/ShardOperationFailedException.java | 0 .../action/TaskOperationFailure.java | 0 .../elasticsearch/action/ThreadingModel.java | 0 .../action/TimestampParsingException.java | 0 .../action/TransportActionNodeProxy.java | 0 .../action/UnavailableShardsException.java | 0 .../elasticsearch/action/ValidateActions.java | 0 .../ClusterAllocationExplainAction.java | 0 .../ClusterAllocationExplainRequest.java | 0 ...lusterAllocationExplainRequestBuilder.java | 0 .../ClusterAllocationExplainResponse.java | 0 .../ClusterAllocationExplanation.java | 0 ...ansportClusterAllocationExplainAction.java | 0 .../cluster/health/ClusterHealthAction.java | 0 .../cluster/health/ClusterHealthRequest.java | 0 .../health/ClusterHealthRequestBuilder.java | 0 .../cluster/health/ClusterHealthResponse.java | 0 .../health/TransportClusterHealthAction.java | 0 .../node/hotthreads/NodeHotThreads.java | 0 .../hotthreads/NodesHotThreadsAction.java | 0 .../hotthreads/NodesHotThreadsRequest.java | 0 .../NodesHotThreadsRequestBuilder.java | 0 .../hotthreads/NodesHotThreadsResponse.java | 0 .../TransportNodesHotThreadsAction.java | 0 .../admin/cluster/node/info/NodeInfo.java | 0 .../cluster/node/info/NodesInfoAction.java | 0 .../cluster/node/info/NodesInfoRequest.java | 0 .../node/info/NodesInfoRequestBuilder.java | 0 .../cluster/node/info/NodesInfoResponse.java | 0 .../cluster/node/info/PluginsAndModules.java | 0 .../node/info/TransportNodesInfoAction.java | 0 .../node/liveness/LivenessRequest.java | 0 .../node/liveness/LivenessResponse.java | 0 .../liveness/TransportLivenessAction.java | 0 .../admin/cluster/node/stats/NodeStats.java | 0 .../cluster/node/stats/NodesStatsAction.java | 0 .../cluster/node/stats/NodesStatsRequest.java | 0 .../node/stats/NodesStatsRequestBuilder.java | 0 .../node/stats/NodesStatsResponse.java | 0 .../node/stats/TransportNodesStatsAction.java | 0 .../node/tasks/cancel/CancelTasksAction.java | 0 .../node/tasks/cancel/CancelTasksRequest.java | 0 .../cancel/CancelTasksRequestBuilder.java | 0 .../tasks/cancel/CancelTasksResponse.java | 0 .../cancel/TransportCancelTasksAction.java | 0 .../cluster/node/tasks/get/GetTaskAction.java | 0 .../node/tasks/get/GetTaskRequest.java | 0 .../node/tasks/get/GetTaskRequestBuilder.java | 0 .../node/tasks/get/GetTaskResponse.java | 0 .../tasks/get/TransportGetTaskAction.java | 0 .../node/tasks/list/ListTasksAction.java | 0 .../node/tasks/list/ListTasksRequest.java | 0 .../tasks/list/ListTasksRequestBuilder.java | 0 .../node/tasks/list/ListTasksResponse.java | 0 .../cluster/node/tasks/list/TaskGroup.java | 0 .../tasks/list/TransportListTasksAction.java | 0 .../admin/cluster/node/usage/NodeUsage.java | 0 .../cluster/node/usage/NodesUsageAction.java | 0 .../cluster/node/usage/NodesUsageRequest.java | 0 .../node/usage/NodesUsageRequestBuilder.java | 0 .../node/usage/NodesUsageResponse.java | 0 .../node/usage/TransportNodesUsageAction.java | 0 .../cluster/remote/RemoteInfoAction.java | 0 .../cluster/remote/RemoteInfoRequest.java | 0 .../remote/RemoteInfoRequestBuilder.java | 0 .../cluster/remote/RemoteInfoResponse.java | 0 .../remote/TransportRemoteInfoAction.java | 0 .../delete/DeleteRepositoryAction.java | 0 .../delete/DeleteRepositoryRequest.java | 0 .../DeleteRepositoryRequestBuilder.java | 0 .../delete/DeleteRepositoryResponse.java | 0 .../TransportDeleteRepositoryAction.java | 0 .../get/GetRepositoriesAction.java | 0 .../get/GetRepositoriesRequest.java | 0 .../get/GetRepositoriesRequestBuilder.java | 0 .../get/GetRepositoriesResponse.java | 0 .../get/TransportGetRepositoriesAction.java | 0 .../repositories/put/PutRepositoryAction.java | 0 .../put/PutRepositoryRequest.java | 0 .../put/PutRepositoryRequestBuilder.java | 0 .../put/PutRepositoryResponse.java | 0 .../put/TransportPutRepositoryAction.java | 0 .../TransportVerifyRepositoryAction.java | 0 .../verify/VerifyRepositoryAction.java | 0 .../verify/VerifyRepositoryRequest.java | 0 .../VerifyRepositoryRequestBuilder.java | 0 .../verify/VerifyRepositoryResponse.java | 0 .../cluster/reroute/ClusterRerouteAction.java | 0 .../reroute/ClusterRerouteRequest.java | 0 .../reroute/ClusterRerouteRequestBuilder.java | 0 .../reroute/ClusterRerouteResponse.java | 0 .../TransportClusterRerouteAction.java | 0 .../settings/ClusterUpdateSettingsAction.java | 0 .../ClusterUpdateSettingsRequest.java | 0 .../ClusterUpdateSettingsRequestBuilder.java | 0 .../ClusterUpdateSettingsResponse.java | 0 .../cluster/settings/SettingsUpdater.java | 0 .../TransportClusterUpdateSettingsAction.java | 0 .../shards/ClusterSearchShardsAction.java | 0 .../shards/ClusterSearchShardsGroup.java | 0 .../shards/ClusterSearchShardsRequest.java | 0 .../ClusterSearchShardsRequestBuilder.java | 0 .../shards/ClusterSearchShardsResponse.java | 0 .../TransportClusterSearchShardsAction.java | 0 .../create/CreateSnapshotAction.java | 0 .../create/CreateSnapshotRequest.java | 0 .../create/CreateSnapshotRequestBuilder.java | 0 .../create/CreateSnapshotResponse.java | 0 .../create/TransportCreateSnapshotAction.java | 0 .../delete/DeleteSnapshotAction.java | 0 .../delete/DeleteSnapshotRequest.java | 0 .../delete/DeleteSnapshotRequestBuilder.java | 0 .../delete/DeleteSnapshotResponse.java | 0 .../delete/TransportDeleteSnapshotAction.java | 0 .../snapshots/get/GetSnapshotsAction.java | 0 .../snapshots/get/GetSnapshotsRequest.java | 0 .../get/GetSnapshotsRequestBuilder.java | 0 .../snapshots/get/GetSnapshotsResponse.java | 0 .../get/TransportGetSnapshotsAction.java | 0 .../restore/RestoreSnapshotAction.java | 0 .../restore/RestoreSnapshotRequest.java | 0 .../RestoreSnapshotRequestBuilder.java | 0 .../restore/RestoreSnapshotResponse.java | 0 .../TransportRestoreSnapshotAction.java | 0 .../status/SnapshotIndexShardStage.java | 0 .../status/SnapshotIndexShardStatus.java | 0 .../snapshots/status/SnapshotIndexStatus.java | 0 .../snapshots/status/SnapshotShardsStats.java | 0 .../snapshots/status/SnapshotStats.java | 0 .../snapshots/status/SnapshotStatus.java | 0 .../status/SnapshotsStatusAction.java | 0 .../status/SnapshotsStatusRequest.java | 0 .../status/SnapshotsStatusRequestBuilder.java | 0 .../status/SnapshotsStatusResponse.java | 0 .../status/TransportNodesSnapshotsStatus.java | 0 .../TransportSnapshotsStatusAction.java | 0 .../cluster/state/ClusterStateAction.java | 0 .../cluster/state/ClusterStateRequest.java | 0 .../state/ClusterStateRequestBuilder.java | 0 .../cluster/state/ClusterStateResponse.java | 0 .../state/TransportClusterStateAction.java | 0 .../cluster/stats/ClusterStatsAction.java | 0 .../cluster/stats/ClusterStatsIndices.java | 0 .../stats/ClusterStatsNodeResponse.java | 0 .../cluster/stats/ClusterStatsNodes.java | 0 .../cluster/stats/ClusterStatsRequest.java | 0 .../stats/ClusterStatsRequestBuilder.java | 0 .../cluster/stats/ClusterStatsResponse.java | 0 .../stats/TransportClusterStatsAction.java | 0 .../DeleteStoredScriptAction.java | 0 .../DeleteStoredScriptRequest.java | 0 .../DeleteStoredScriptRequestBuilder.java | 0 .../DeleteStoredScriptResponse.java | 0 .../storedscripts/GetStoredScriptAction.java | 0 .../storedscripts/GetStoredScriptRequest.java | 0 .../GetStoredScriptRequestBuilder.java | 0 .../GetStoredScriptResponse.java | 0 .../storedscripts/PutStoredScriptAction.java | 0 .../storedscripts/PutStoredScriptRequest.java | 0 .../PutStoredScriptRequestBuilder.java | 0 .../PutStoredScriptResponse.java | 0 .../TransportDeleteStoredScriptAction.java | 0 .../TransportGetStoredScriptAction.java | 0 .../TransportPutStoredScriptAction.java | 0 .../tasks/PendingClusterTasksAction.java | 0 .../tasks/PendingClusterTasksRequest.java | 0 .../PendingClusterTasksRequestBuilder.java | 0 .../tasks/PendingClusterTasksResponse.java | 0 .../TransportPendingClusterTasksAction.java | 0 .../action/admin/indices/alias/Alias.java | 0 .../indices/alias/IndicesAliasesAction.java | 0 ...dicesAliasesClusterStateUpdateRequest.java | 0 .../indices/alias/IndicesAliasesRequest.java | 0 .../alias/IndicesAliasesRequestBuilder.java | 0 .../indices/alias/IndicesAliasesResponse.java | 0 .../alias/TransportIndicesAliasesAction.java | 0 .../alias/exists/AliasesExistAction.java | 0 .../exists/AliasesExistRequestBuilder.java | 0 .../alias/exists/AliasesExistResponse.java | 0 .../exists/TransportAliasesExistAction.java | 0 .../alias/get/BaseAliasesRequestBuilder.java | 0 .../indices/alias/get/GetAliasesAction.java | 0 .../indices/alias/get/GetAliasesRequest.java | 0 .../alias/get/GetAliasesRequestBuilder.java | 0 .../indices/alias/get/GetAliasesResponse.java | 0 .../alias/get/TransportGetAliasesAction.java | 0 .../admin/indices/analyze/AnalyzeAction.java | 0 .../admin/indices/analyze/AnalyzeRequest.java | 0 .../analyze/AnalyzeRequestBuilder.java | 0 .../indices/analyze/AnalyzeResponse.java | 0 .../analyze/DetailAnalyzeResponse.java | 0 .../analyze/TransportAnalyzeAction.java | 0 .../cache/clear/ClearIndicesCacheAction.java | 0 .../cache/clear/ClearIndicesCacheRequest.java | 0 .../ClearIndicesCacheRequestBuilder.java | 0 .../clear/ClearIndicesCacheResponse.java | 0 .../TransportClearIndicesCacheAction.java | 0 .../admin/indices/close/CloseIndexAction.java | 0 .../CloseIndexClusterStateUpdateRequest.java | 0 .../indices/close/CloseIndexRequest.java | 0 .../close/CloseIndexRequestBuilder.java | 0 .../indices/close/CloseIndexResponse.java | 0 .../close/TransportCloseIndexAction.java | 0 .../indices/create/CreateIndexAction.java | 0 .../CreateIndexClusterStateUpdateRequest.java | 0 .../indices/create/CreateIndexRequest.java | 0 .../create/CreateIndexRequestBuilder.java | 0 .../indices/create/CreateIndexResponse.java | 0 .../create/TransportCreateIndexAction.java | 0 .../admin/indices/create/package-info.java | 0 .../indices/delete/DeleteIndexAction.java | 0 .../DeleteIndexClusterStateUpdateRequest.java | 0 .../indices/delete/DeleteIndexRequest.java | 0 .../delete/DeleteIndexRequestBuilder.java | 0 .../indices/delete/DeleteIndexResponse.java | 0 .../delete/TransportDeleteIndexAction.java | 0 .../admin/indices/delete/package-info.java | 0 .../exists/indices/IndicesExistsAction.java | 0 .../exists/indices/IndicesExistsRequest.java | 0 .../indices/IndicesExistsRequestBuilder.java | 0 .../exists/indices/IndicesExistsResponse.java | 0 .../indices/TransportIndicesExistsAction.java | 0 .../types/TransportTypesExistsAction.java | 0 .../exists/types/TypesExistsAction.java | 0 .../exists/types/TypesExistsRequest.java | 0 .../types/TypesExistsRequestBuilder.java | 0 .../exists/types/TypesExistsResponse.java | 0 .../admin/indices/flush/FlushAction.java | 0 .../admin/indices/flush/FlushRequest.java | 0 .../indices/flush/FlushRequestBuilder.java | 0 .../admin/indices/flush/FlushResponse.java | 0 .../indices/flush/ShardFlushRequest.java | 0 .../indices/flush/SyncedFlushAction.java | 0 .../indices/flush/SyncedFlushRequest.java | 0 .../flush/SyncedFlushRequestBuilder.java | 0 .../indices/flush/SyncedFlushResponse.java | 0 .../indices/flush/TransportFlushAction.java | 0 .../flush/TransportShardFlushAction.java | 0 .../flush/TransportSyncedFlushAction.java | 0 .../admin/indices/flush/package-info.java | 0 .../indices/forcemerge/ForceMergeAction.java | 0 .../indices/forcemerge/ForceMergeRequest.java | 0 .../forcemerge/ForceMergeRequestBuilder.java | 0 .../forcemerge/ForceMergeResponse.java | 0 .../forcemerge/TransportForceMergeAction.java | 0 .../indices/forcemerge/package-info.java | 0 .../admin/indices/get/GetIndexAction.java | 0 .../admin/indices/get/GetIndexRequest.java | 0 .../indices/get/GetIndexRequestBuilder.java | 0 .../admin/indices/get/GetIndexResponse.java | 0 .../indices/get/TransportGetIndexAction.java | 0 .../mapping/get/GetFieldMappingsAction.java | 0 .../get/GetFieldMappingsIndexRequest.java | 0 .../mapping/get/GetFieldMappingsRequest.java | 0 .../get/GetFieldMappingsRequestBuilder.java | 0 .../mapping/get/GetFieldMappingsResponse.java | 0 .../mapping/get/GetMappingsAction.java | 0 .../mapping/get/GetMappingsRequest.java | 0 .../get/GetMappingsRequestBuilder.java | 0 .../mapping/get/GetMappingsResponse.java | 0 .../get/TransportGetFieldMappingsAction.java | 0 .../TransportGetFieldMappingsIndexAction.java | 0 .../get/TransportGetMappingsAction.java | 0 .../admin/indices/mapping/package-info.java | 0 .../indices/mapping/put/PutMappingAction.java | 0 .../PutMappingClusterStateUpdateRequest.java | 0 .../mapping/put/PutMappingRequest.java | 0 .../mapping/put/PutMappingRequestBuilder.java | 0 .../mapping/put/PutMappingResponse.java | 0 .../put/TransportPutMappingAction.java | 0 .../indices/mapping/put/package-info.java | 0 .../admin/indices/open/OpenIndexAction.java | 0 .../OpenIndexClusterStateUpdateRequest.java | 0 .../admin/indices/open/OpenIndexRequest.java | 0 .../indices/open/OpenIndexRequestBuilder.java | 0 .../admin/indices/open/OpenIndexResponse.java | 0 .../open/TransportOpenIndexAction.java | 0 .../action/admin/indices/package-info.java | 0 .../indices/recovery/RecoveryAction.java | 0 .../indices/recovery/RecoveryRequest.java | 0 .../recovery/RecoveryRequestBuilder.java | 0 .../indices/recovery/RecoveryResponse.java | 0 .../recovery/TransportRecoveryAction.java | 0 .../admin/indices/refresh/RefreshAction.java | 0 .../admin/indices/refresh/RefreshRequest.java | 0 .../refresh/RefreshRequestBuilder.java | 0 .../indices/refresh/RefreshResponse.java | 0 .../refresh/TransportRefreshAction.java | 0 .../refresh/TransportShardRefreshAction.java | 0 .../admin/indices/refresh/package-info.java | 0 .../admin/indices/rollover/Condition.java | 0 .../indices/rollover/MaxAgeCondition.java | 0 .../indices/rollover/MaxDocsCondition.java | 0 .../indices/rollover/MaxSizeCondition.java | 0 .../indices/rollover/RolloverAction.java | 0 .../indices/rollover/RolloverRequest.java | 0 .../rollover/RolloverRequestBuilder.java | 0 .../indices/rollover/RolloverResponse.java | 0 .../rollover/TransportRolloverAction.java | 0 .../admin/indices/segments/IndexSegments.java | 0 .../indices/segments/IndexShardSegments.java | 0 .../segments/IndicesSegmentResponse.java | 0 .../segments/IndicesSegmentsAction.java | 0 .../segments/IndicesSegmentsRequest.java | 0 .../IndicesSegmentsRequestBuilder.java | 0 .../admin/indices/segments/ShardSegments.java | 0 .../TransportIndicesSegmentsAction.java | 0 .../settings/get/GetSettingsAction.java | 0 .../settings/get/GetSettingsRequest.java | 0 .../get/GetSettingsRequestBuilder.java | 0 .../settings/get/GetSettingsResponse.java | 0 .../get/TransportGetSettingsAction.java | 0 .../put/TransportUpdateSettingsAction.java | 0 .../settings/put/UpdateSettingsAction.java | 0 ...dateSettingsClusterStateUpdateRequest.java | 0 .../settings/put/UpdateSettingsRequest.java | 0 .../put/UpdateSettingsRequestBuilder.java | 0 .../settings/put/UpdateSettingsResponse.java | 0 .../IndicesShardStoreRequestBuilder.java | 0 .../shards/IndicesShardStoresAction.java | 0 .../shards/IndicesShardStoresRequest.java | 0 .../shards/IndicesShardStoresResponse.java | 0 .../TransportIndicesShardStoresAction.java | 0 .../admin/indices/shrink/ResizeAction.java | 0 .../admin/indices/shrink/ResizeRequest.java | 0 .../indices/shrink/ResizeRequestBuilder.java | 0 .../admin/indices/shrink/ResizeResponse.java | 0 .../admin/indices/shrink/ResizeType.java | 0 .../admin/indices/shrink/ShrinkAction.java | 0 .../indices/shrink/TransportResizeAction.java | 0 .../indices/shrink/TransportShrinkAction.java | 0 .../admin/indices/stats/CommonStats.java | 0 .../admin/indices/stats/CommonStatsFlags.java | 0 .../admin/indices/stats/IndexShardStats.java | 0 .../admin/indices/stats/IndexStats.java | 0 .../indices/stats/IndicesStatsAction.java | 0 .../indices/stats/IndicesStatsRequest.java | 0 .../stats/IndicesStatsRequestBuilder.java | 0 .../indices/stats/IndicesStatsResponse.java | 0 .../admin/indices/stats/ShardStats.java | 0 .../stats/TransportIndicesStatsAction.java | 0 .../delete/DeleteIndexTemplateAction.java | 0 .../delete/DeleteIndexTemplateRequest.java | 0 .../DeleteIndexTemplateRequestBuilder.java | 0 .../delete/DeleteIndexTemplateResponse.java | 0 .../TransportDeleteIndexTemplateAction.java | 0 .../template/get/GetIndexTemplatesAction.java | 0 .../get/GetIndexTemplatesRequest.java | 0 .../get/GetIndexTemplatesRequestBuilder.java | 0 .../get/GetIndexTemplatesResponse.java | 0 .../get/TransportGetIndexTemplatesAction.java | 0 .../template/put/PutIndexTemplateAction.java | 0 .../template/put/PutIndexTemplateRequest.java | 0 .../put/PutIndexTemplateRequestBuilder.java | 0 .../put/PutIndexTemplateResponse.java | 0 .../put/TransportPutIndexTemplateAction.java | 0 .../upgrade/get/IndexShardUpgradeStatus.java | 0 .../upgrade/get/IndexUpgradeStatus.java | 0 .../upgrade/get/ShardUpgradeStatus.java | 0 .../get/TransportUpgradeStatusAction.java | 0 .../upgrade/get/UpgradeStatusAction.java | 0 .../upgrade/get/UpgradeStatusRequest.java | 0 .../get/UpgradeStatusRequestBuilder.java | 0 .../upgrade/get/UpgradeStatusResponse.java | 0 .../upgrade/post/ShardUpgradeRequest.java | 0 .../upgrade/post/ShardUpgradeResult.java | 0 .../upgrade/post/TransportUpgradeAction.java | 0 .../post/TransportUpgradeSettingsAction.java | 0 .../indices/upgrade/post/UpgradeAction.java | 0 .../indices/upgrade/post/UpgradeRequest.java | 0 .../upgrade/post/UpgradeRequestBuilder.java | 0 .../indices/upgrade/post/UpgradeResponse.java | 0 .../upgrade/post/UpgradeSettingsAction.java | 0 ...radeSettingsClusterStateUpdateRequest.java | 0 .../upgrade/post/UpgradeSettingsRequest.java | 0 .../post/UpgradeSettingsRequestBuilder.java | 0 .../upgrade/post/UpgradeSettingsResponse.java | 0 .../validate/query/QueryExplanation.java | 0 .../query/ShardValidateQueryRequest.java | 0 .../query/ShardValidateQueryResponse.java | 0 .../query/TransportValidateQueryAction.java | 0 .../validate/query/ValidateQueryAction.java | 0 .../validate/query/ValidateQueryRequest.java | 0 .../query/ValidateQueryRequestBuilder.java | 0 .../validate/query/ValidateQueryResponse.java | 0 .../indices/validate/query/package-info.java | 0 .../action/admin/package-info.java | 0 .../action/bulk/BackoffPolicy.java | 0 .../elasticsearch/action/bulk/BulkAction.java | 0 .../action/bulk/BulkItemRequest.java | 0 .../action/bulk/BulkItemResponse.java | 0 .../action/bulk/BulkItemResultHolder.java | 0 .../action/bulk/BulkProcessor.java | 0 .../action/bulk/BulkRequest.java | 0 .../action/bulk/BulkRequestBuilder.java | 0 .../action/bulk/BulkRequestHandler.java | 0 .../action/bulk/BulkResponse.java | 0 .../action/bulk/BulkShardRequest.java | 0 .../action/bulk/BulkShardResponse.java | 0 .../action/bulk/MappingUpdatePerformer.java | 0 .../org/elasticsearch/action/bulk/Retry.java | 0 .../action/bulk/TransportBulkAction.java | 0 .../action/bulk/TransportShardBulkAction.java | 0 .../TransportSingleItemBulkWriteAction.java | 0 .../action/delete/DeleteAction.java | 0 .../action/delete/DeleteRequest.java | 0 .../action/delete/DeleteRequestBuilder.java | 0 .../action/delete/DeleteResponse.java | 0 .../action/delete/TransportDeleteAction.java | 0 .../action/delete/package-info.java | 0 .../action/explain/ExplainAction.java | 0 .../action/explain/ExplainRequest.java | 0 .../action/explain/ExplainRequestBuilder.java | 0 .../action/explain/ExplainResponse.java | 0 .../explain/TransportExplainAction.java | 0 .../action/explain/package-info.java | 0 .../action/fieldcaps/FieldCapabilities.java | 0 .../fieldcaps/FieldCapabilitiesAction.java | 0 .../FieldCapabilitiesIndexRequest.java | 0 .../FieldCapabilitiesIndexResponse.java | 0 .../fieldcaps/FieldCapabilitiesRequest.java | 0 .../FieldCapabilitiesRequestBuilder.java | 0 .../fieldcaps/FieldCapabilitiesResponse.java | 0 .../TransportFieldCapabilitiesAction.java | 0 ...TransportFieldCapabilitiesIndexAction.java | 0 .../elasticsearch/action/get/GetAction.java | 0 .../elasticsearch/action/get/GetRequest.java | 0 .../action/get/GetRequestBuilder.java | 0 .../elasticsearch/action/get/GetResponse.java | 0 .../action/get/MultiGetAction.java | 0 .../action/get/MultiGetItemResponse.java | 0 .../action/get/MultiGetRequest.java | 0 .../action/get/MultiGetRequestBuilder.java | 0 .../action/get/MultiGetResponse.java | 0 .../action/get/MultiGetShardRequest.java | 0 .../action/get/MultiGetShardResponse.java | 0 .../action/get/TransportGetAction.java | 0 .../action/get/TransportMultiGetAction.java | 0 .../get/TransportShardMultiGetAction.java | 0 .../action/get/package-info.java | 0 .../action/index/IndexAction.java | 0 .../action/index/IndexRequest.java | 0 .../action/index/IndexRequestBuilder.java | 0 .../action/index/IndexResponse.java | 0 .../action/index/TransportIndexAction.java | 0 .../action/index/package-info.java | 0 .../action/ingest/DeletePipelineAction.java | 0 .../action/ingest/DeletePipelineRequest.java | 0 .../ingest/DeletePipelineRequestBuilder.java | 0 .../ingest/DeletePipelineTransportAction.java | 0 .../action/ingest/GetPipelineAction.java | 0 .../action/ingest/GetPipelineRequest.java | 0 .../ingest/GetPipelineRequestBuilder.java | 0 .../action/ingest/GetPipelineResponse.java | 0 .../ingest/GetPipelineTransportAction.java | 0 .../action/ingest/IngestActionForwarder.java | 0 .../action/ingest/PutPipelineAction.java | 0 .../action/ingest/PutPipelineRequest.java | 0 .../ingest/PutPipelineRequestBuilder.java | 0 .../ingest/PutPipelineTransportAction.java | 0 .../ingest/SimulateDocumentBaseResult.java | 0 .../action/ingest/SimulateDocumentResult.java | 0 .../ingest/SimulateDocumentVerboseResult.java | 0 .../ingest/SimulateExecutionService.java | 0 .../action/ingest/SimulatePipelineAction.java | 0 .../ingest/SimulatePipelineRequest.java | 0 .../SimulatePipelineRequestBuilder.java | 0 .../ingest/SimulatePipelineResponse.java | 0 .../SimulatePipelineTransportAction.java | 0 .../ingest/SimulateProcessorResult.java | 0 .../ingest/TrackingResultProcessor.java | 0 .../action/ingest/WritePipelineResponse.java | 0 .../ingest/WriteableIngestDocument.java | 0 .../elasticsearch/action/main/MainAction.java | 0 .../action/main/MainRequest.java | 0 .../action/main/MainRequestBuilder.java | 0 .../action/main/MainResponse.java | 0 .../action/main/TransportMainAction.java | 0 .../elasticsearch/action/package-info.java | 0 .../resync/ResyncReplicationRequest.java | 0 .../resync/ResyncReplicationResponse.java | 0 .../TransportResyncReplicationAction.java | 0 .../search/AbstractSearchAsyncAction.java | 0 .../search/CanMatchPreFilterSearchPhase.java | 0 .../action/search/ClearScrollAction.java | 0 .../action/search/ClearScrollController.java | 0 .../action/search/ClearScrollRequest.java | 0 .../search/ClearScrollRequestBuilder.java | 0 .../action/search/ClearScrollResponse.java | 0 .../action/search/CountedCollector.java | 0 .../action/search/DfsQueryPhase.java | 0 .../action/search/ExpandSearchPhase.java | 0 .../action/search/FetchSearchPhase.java | 0 .../action/search/InitialSearchPhase.java | 0 .../action/search/MultiSearchAction.java | 0 .../action/search/MultiSearchRequest.java | 0 .../search/MultiSearchRequestBuilder.java | 0 .../action/search/MultiSearchResponse.java | 0 .../action/search/ParsedScrollId.java | 0 .../search/ReduceSearchPhaseException.java | 0 .../action/search/ScrollIdForNode.java | 0 .../action/search/SearchAction.java | 0 .../action/search/SearchActionListener.java | 0 .../SearchDfsQueryThenFetchAsyncAction.java | 0 .../search/SearchExecutionStatsCollector.java | 0 .../action/search/SearchPhase.java | 0 .../action/search/SearchPhaseContext.java | 0 .../action/search/SearchPhaseController.java | 0 .../search/SearchPhaseExecutionException.java | 0 .../SearchQueryThenFetchAsyncAction.java | 0 .../action/search/SearchRequest.java | 0 .../action/search/SearchRequestBuilder.java | 0 .../action/search/SearchResponse.java | 0 .../action/search/SearchResponseSections.java | 0 .../action/search/SearchScrollAction.java | 0 .../search/SearchScrollAsyncAction.java | 0 .../SearchScrollQueryAndFetchAsyncAction.java | 0 ...SearchScrollQueryThenFetchAsyncAction.java | 0 .../action/search/SearchScrollRequest.java | 0 .../search/SearchScrollRequestBuilder.java | 0 .../action/search/SearchShardIterator.java | 0 .../action/search/SearchTask.java | 0 .../action/search/SearchTransportService.java | 0 .../action/search/SearchType.java | 0 .../action/search/ShardSearchFailure.java | 0 .../search/TransportClearScrollAction.java | 0 .../search/TransportMultiSearchAction.java | 0 .../action/search/TransportSearchAction.java | 0 .../action/search/TransportSearchHelper.java | 0 .../search/TransportSearchScrollAction.java | 0 .../action/search/package-info.java | 0 .../action/support/ActionFilter.java | 0 .../action/support/ActionFilterChain.java | 0 .../action/support/ActionFilters.java | 0 .../action/support/ActiveShardCount.java | 0 .../action/support/ActiveShardsObserver.java | 0 .../action/support/AdapterActionFuture.java | 0 .../action/support/AutoCreateIndex.java | 0 .../ContextPreservingActionListener.java | 0 .../DefaultShardOperationFailedException.java | 0 .../support/DelegatingActionListener.java | 0 .../action/support/DestructiveOperations.java | 0 .../action/support/GroupedActionListener.java | 0 .../support/HandledTransportAction.java | 0 .../action/support/IndicesOptions.java | 0 .../action/support/PlainActionFuture.java | 0 .../support/PlainListenableActionFuture.java | 0 .../support/ThreadedActionListener.java | 0 .../action/support/TransportAction.java | 0 .../action/support/TransportActions.java | 0 .../action/support/WriteRequest.java | 0 .../action/support/WriteRequestBuilder.java | 0 .../action/support/WriteResponse.java | 0 .../BroadcastOperationRequestBuilder.java | 0 .../support/broadcast/BroadcastRequest.java | 0 .../support/broadcast/BroadcastResponse.java | 0 ...roadcastShardOperationFailedException.java | 0 .../broadcast/BroadcastShardRequest.java | 0 .../broadcast/BroadcastShardResponse.java | 0 .../broadcast/TransportBroadcastAction.java | 0 .../node/TransportBroadcastByNodeAction.java | 0 .../support/master/AcknowledgedRequest.java | 0 .../master/AcknowledgedRequestBuilder.java | 0 .../support/master/AcknowledgedResponse.java | 0 .../MasterNodeOperationRequestBuilder.java | 0 ...MasterNodeReadOperationRequestBuilder.java | 0 .../support/master/MasterNodeReadRequest.java | 0 .../support/master/MasterNodeRequest.java | 0 .../master/TransportMasterNodeAction.java | 0 .../master/TransportMasterNodeReadAction.java | 0 .../master/info/ClusterInfoRequest.java | 0 .../info/ClusterInfoRequestBuilder.java | 0 .../info/TransportClusterInfoAction.java | 0 .../action/support/nodes/BaseNodeRequest.java | 0 .../support/nodes/BaseNodeResponse.java | 0 .../support/nodes/BaseNodesRequest.java | 0 .../support/nodes/BaseNodesResponse.java | 0 .../nodes/NodesOperationRequestBuilder.java | 0 .../support/nodes/TransportNodesAction.java | 0 .../replication/BasicReplicationRequest.java | 0 .../replication/ReplicatedWriteRequest.java | 0 .../replication/ReplicationOperation.java | 0 .../replication/ReplicationRequest.java | 0 .../ReplicationRequestBuilder.java | 0 .../replication/ReplicationResponse.java | 0 .../support/replication/ReplicationTask.java | 0 .../TransportBroadcastReplicationAction.java | 0 .../TransportReplicationAction.java | 0 .../replication/TransportWriteAction.java | 0 .../InstanceShardOperationRequest.java | 0 .../InstanceShardOperationRequestBuilder.java | 0 ...ransportInstanceSingleOperationAction.java | 0 .../SingleShardOperationRequestBuilder.java | 0 .../single/shard/SingleShardRequest.java | 0 .../shard/TransportSingleShardAction.java | 0 .../support/tasks/BaseTasksRequest.java | 0 .../support/tasks/BaseTasksResponse.java | 0 .../support/tasks/TasksRequestBuilder.java | 0 .../support/tasks/TransportTasksAction.java | 0 .../termvectors/MultiTermVectorsAction.java | 0 .../MultiTermVectorsItemResponse.java | 0 .../termvectors/MultiTermVectorsRequest.java | 0 .../MultiTermVectorsRequestBuilder.java | 0 .../termvectors/MultiTermVectorsResponse.java | 0 .../MultiTermVectorsShardRequest.java | 0 .../MultiTermVectorsShardResponse.java | 0 .../action/termvectors/TermVectorsAction.java | 0 .../action/termvectors/TermVectorsFields.java | 0 .../action/termvectors/TermVectorsFilter.java | 0 .../termvectors/TermVectorsRequest.java | 0 .../TermVectorsRequestBuilder.java | 0 .../termvectors/TermVectorsResponse.java | 0 .../action/termvectors/TermVectorsWriter.java | 0 .../TransportMultiTermVectorsAction.java | 0 .../TransportShardMultiTermsVectorAction.java | 0 .../TransportTermVectorsAction.java | 0 .../action/termvectors/package-info.java | 0 .../action/update/TransportUpdateAction.java | 0 .../action/update/UpdateAction.java | 0 .../action/update/UpdateHelper.java | 0 .../action/update/UpdateRequest.java | 0 .../action/update/UpdateRequestBuilder.java | 0 .../action/update/UpdateResponse.java | 0 .../elasticsearch/bootstrap/Bootstrap.java | 0 .../bootstrap/BootstrapCheck.java | 0 .../bootstrap/BootstrapChecks.java | 0 .../bootstrap/BootstrapContext.java | 0 .../bootstrap/BootstrapException.java | 0 .../bootstrap/BootstrapInfo.java | 0 .../bootstrap/BootstrapSettings.java | 0 .../bootstrap/ConsoleCtrlHandler.java | 0 .../org/elasticsearch/bootstrap/ESPolicy.java | 0 .../bootstrap/Elasticsearch.java | 0 ...ElasticsearchUncaughtExceptionHandler.java | 0 .../bootstrap/FilePermissionUtils.java | 0 .../elasticsearch/bootstrap/JNACLibrary.java | 0 .../bootstrap/JNAKernel32Library.java | 0 .../elasticsearch/bootstrap/JNANatives.java | 0 .../org/elasticsearch/bootstrap/JarHell.java | 0 .../elasticsearch/bootstrap/JavaVersion.java | 0 .../org/elasticsearch/bootstrap/Natives.java | 0 .../org/elasticsearch/bootstrap/Security.java | 0 .../org/elasticsearch/bootstrap/Spawner.java | 0 .../bootstrap/StartupException.java | 0 .../bootstrap/SystemCallFilter.java | 0 .../cli/CommandLoggingConfigurator.java | 0 .../cli/EnvironmentAwareCommand.java | 0 .../cli/LoggingAwareCommand.java | 0 .../cli/LoggingAwareMultiCommand.java | 0 .../org/elasticsearch/client/AdminClient.java | 0 .../java/org/elasticsearch/client/Client.java | 0 .../client/ClusterAdminClient.java | 0 .../client/ElasticsearchClient.java | 0 .../elasticsearch/client/FilterClient.java | 0 .../client/IndicesAdminClient.java | 0 .../client/ParentTaskAssigningClient.java | 0 .../org/elasticsearch/client/Requests.java | 0 .../elasticsearch/client/node/NodeClient.java | 0 .../elasticsearch/client/package-info.java | 0 .../client/support/AbstractClient.java | 0 .../transport/NoNodeAvailableException.java | 0 .../client/transport/TransportClient.java | 0 .../TransportClientNodesService.java | 0 .../transport/TransportProxyClient.java | 0 .../cluster/AbstractDiffable.java | 0 .../cluster/AbstractNamedDiffable.java | 0 .../AckedClusterStateTaskListener.java | 0 .../cluster/AckedClusterStateUpdateTask.java | 0 .../cluster/ClusterChangedEvent.java | 0 .../elasticsearch/cluster/ClusterInfo.java | 0 .../cluster/ClusterInfoService.java | 0 .../elasticsearch/cluster/ClusterModule.java | 0 .../elasticsearch/cluster/ClusterName.java | 0 .../elasticsearch/cluster/ClusterState.java | 0 .../cluster/ClusterStateApplier.java | 0 .../cluster/ClusterStateListener.java | 0 .../cluster/ClusterStateObserver.java | 0 .../cluster/ClusterStateTaskConfig.java | 0 .../cluster/ClusterStateTaskExecutor.java | 0 .../cluster/ClusterStateTaskListener.java | 0 .../cluster/ClusterStateUpdateTask.java | 0 .../java/org/elasticsearch/cluster/Diff.java | 0 .../org/elasticsearch/cluster/Diffable.java | 0 .../elasticsearch/cluster/DiffableUtils.java | 0 .../org/elasticsearch/cluster/DiskUsage.java | 0 .../cluster/EmptyClusterInfoService.java | 0 ...ompatibleClusterStateVersionException.java | 0 .../cluster/InternalClusterInfoService.java | 0 .../cluster/LocalClusterUpdateTask.java | 0 .../cluster/LocalNodeMasterListener.java | 0 .../cluster/MasterNodeChangePredicate.java | 0 .../cluster/MergableCustomMetaData.java | 0 .../org/elasticsearch/cluster/NamedDiff.java | 0 .../elasticsearch/cluster/NamedDiffable.java | 0 .../cluster/NamedDiffableValueSerializer.java | 0 .../cluster/NodeConnectionsService.java | 0 .../cluster/NotMasterException.java | 0 .../cluster/RestoreInProgress.java | 0 .../cluster/SnapshotDeletionsInProgress.java | 0 .../cluster/SnapshotsInProgress.java | 0 .../cluster/TimeoutClusterStateListener.java | 0 .../cluster/ack/AckedRequest.java | 0 .../ack/ClusterStateUpdateRequest.java | 0 .../ack/ClusterStateUpdateResponse.java | 0 ...CreateIndexClusterStateUpdateResponse.java | 0 .../ack/IndicesClusterStateUpdateRequest.java | 0 .../OpenIndexClusterStateUpdateResponse.java | 0 .../action/index/MappingUpdatedAction.java | 0 .../index/NodeMappingRefreshAction.java | 0 .../action/shard/ShardStateAction.java | 0 .../cluster/block/ClusterBlock.java | 0 .../cluster/block/ClusterBlockException.java | 0 .../cluster/block/ClusterBlockLevel.java | 0 .../cluster/block/ClusterBlocks.java | 0 .../cluster/health/ClusterHealthStatus.java | 0 .../cluster/health/ClusterIndexHealth.java | 0 .../cluster/health/ClusterShardHealth.java | 0 .../cluster/health/ClusterStateHealth.java | 0 .../cluster/metadata/AliasAction.java | 0 .../cluster/metadata/AliasMetaData.java | 0 .../cluster/metadata/AliasOrIndex.java | 0 .../cluster/metadata/AliasValidator.java | 0 .../cluster/metadata/AutoExpandReplicas.java | 0 .../ClusterNameExpressionResolver.java | 0 .../cluster/metadata/IndexGraveyard.java | 0 .../cluster/metadata/IndexMetaData.java | 0 .../metadata/IndexNameExpressionResolver.java | 0 .../cluster/metadata/IndexTemplateFilter.java | 0 .../metadata/IndexTemplateMetaData.java | 0 .../cluster/metadata/MappingMetaData.java | 0 .../cluster/metadata/MetaData.java | 0 .../metadata/MetaDataCreateIndexService.java | 0 .../metadata/MetaDataDeleteIndexService.java | 0 .../metadata/MetaDataIndexAliasesService.java | 0 .../metadata/MetaDataIndexStateService.java | 0 .../MetaDataIndexTemplateService.java | 0 .../metadata/MetaDataIndexUpgradeService.java | 0 .../metadata/MetaDataMappingService.java | 0 .../MetaDataUpdateSettingsService.java | 0 .../ProcessClusterEventTimeoutException.java | 0 .../metadata/RepositoriesMetaData.java | 0 .../cluster/metadata/RepositoryMetaData.java | 0 .../metadata/TemplateUpgradeService.java | 0 .../cluster/node/DiscoveryNode.java | 0 .../cluster/node/DiscoveryNodeFilters.java | 0 .../cluster/node/DiscoveryNodes.java | 0 .../cluster/routing/AllocationId.java | 0 .../routing/DelayedAllocationService.java | 0 .../cluster/routing/GroupShardsIterator.java | 0 .../IllegalShardRoutingStateException.java | 0 .../cluster/routing/IndexRoutingTable.java | 0 .../routing/IndexShardRoutingTable.java | 0 .../cluster/routing/Murmur3HashFunction.java | 0 .../cluster/routing/OperationRouting.java | 0 .../cluster/routing/PlainShardIterator.java | 0 .../cluster/routing/PlainShardsIterator.java | 0 .../cluster/routing/Preference.java | 0 .../cluster/routing/RecoverySource.java | 0 .../routing/RotationShardShuffler.java | 0 .../routing/RoutingChangesObserver.java | 0 .../cluster/routing/RoutingException.java | 0 .../cluster/routing/RoutingNode.java | 0 .../cluster/routing/RoutingNodes.java | 0 .../cluster/routing/RoutingService.java | 0 .../cluster/routing/RoutingTable.java | 0 .../cluster/routing/ShardIterator.java | 0 .../cluster/routing/ShardRouting.java | 0 .../cluster/routing/ShardRoutingState.java | 0 .../cluster/routing/ShardShuffler.java | 0 .../cluster/routing/ShardsIterator.java | 0 .../cluster/routing/UnassignedInfo.java | 0 .../AbstractAllocationDecision.java | 0 .../AllocateUnassignedDecision.java | 0 .../allocation/AllocationDecision.java | 0 .../routing/allocation/AllocationService.java | 0 .../allocation/DiskThresholdMonitor.java | 0 .../allocation/DiskThresholdSettings.java | 0 .../routing/allocation/FailedShard.java | 0 .../allocation/IndexMetaDataUpdater.java | 0 .../routing/allocation/MoveDecision.java | 0 .../allocation/NodeAllocationResult.java | 0 .../allocation/RerouteExplanation.java | 0 .../routing/allocation/RoutingAllocation.java | 0 .../allocation/RoutingExplanations.java | 0 .../RoutingNodesChangedObserver.java | 0 .../allocation/ShardAllocationDecision.java | 0 .../routing/allocation/StaleShard.java | 0 .../allocator/BalancedShardsAllocator.java | 0 .../allocation/allocator/ShardsAllocator.java | 0 .../AbstractAllocateAllocationCommand.java | 0 ...AllocateEmptyPrimaryAllocationCommand.java | 0 .../AllocateReplicaAllocationCommand.java | 0 ...AllocateStalePrimaryAllocationCommand.java | 0 .../allocation/command/AllocationCommand.java | 0 .../command/AllocationCommands.java | 0 .../command/BasePrimaryAllocationCommand.java | 0 .../command/CancelAllocationCommand.java | 0 .../command/MoveAllocationCommand.java | 0 .../allocation/decider/AllocationDecider.java | 0 .../decider/AllocationDeciders.java | 0 .../decider/AwarenessAllocationDecider.java | 0 .../ClusterRebalanceAllocationDecider.java | 0 .../ConcurrentRebalanceAllocationDecider.java | 0 .../routing/allocation/decider/Decision.java | 0 .../decider/DiskThresholdDecider.java | 0 .../decider/EnableAllocationDecider.java | 0 .../decider/FilterAllocationDecider.java | 0 .../decider/MaxRetryAllocationDecider.java | 0 .../decider/NodeVersionAllocationDecider.java | 0 ...alanceOnlyWhenActiveAllocationDecider.java | 0 ...caAfterPrimaryActiveAllocationDecider.java | 0 .../decider/ResizeAllocationDecider.java | 0 .../RestoreInProgressAllocationDecider.java | 0 .../decider/SameShardAllocationDecider.java | 0 .../decider/ShardsLimitAllocationDecider.java | 0 .../SnapshotInProgressAllocationDecider.java | 0 .../decider/ThrottlingAllocationDecider.java | 0 .../cluster/service/ClusterApplier.java | 0 .../service/ClusterApplierService.java | 0 .../cluster/service/ClusterService.java | 0 .../cluster/service/MasterService.java | 0 .../cluster/service/PendingClusterTask.java | 0 .../service/SourcePrioritizedRunnable.java | 0 .../cluster/service/TaskBatcher.java | 0 .../org/elasticsearch/common/Booleans.java | 0 .../common/CheckedBiConsumer.java | 0 .../elasticsearch/common/CheckedConsumer.java | 0 .../elasticsearch/common/CheckedFunction.java | 0 .../elasticsearch/common/CheckedRunnable.java | 0 .../elasticsearch/common/CheckedSupplier.java | 0 .../org/elasticsearch/common/Classes.java | 0 .../org/elasticsearch/common/Explicit.java | 0 .../ExponentiallyWeightedMovingAverage.java | 0 .../common/FieldMemoryStats.java | 0 .../common/LegacyTimeBasedUUIDGenerator.java | 0 .../common/MacAddressProvider.java | 0 .../elasticsearch/common/NamedRegistry.java | 0 .../org/elasticsearch/common/Nullable.java | 0 .../org/elasticsearch/common/Numbers.java | 0 .../org/elasticsearch/common/ParseField.java | 0 .../common/ParsingException.java | 0 .../org/elasticsearch/common/PidFile.java | 0 .../org/elasticsearch/common/Priority.java | 0 .../common/RandomBasedUUIDGenerator.java | 0 .../org/elasticsearch/common/Randomness.java | 0 .../common/SecureRandomHolder.java | 0 .../org/elasticsearch/common/StopWatch.java | 0 .../org/elasticsearch/common/Strings.java | 0 .../common/SuppressForbidden.java | 0 .../common/SuppressLoggerChecks.java | 0 .../java/org/elasticsearch/common/Table.java | 0 .../common/TimeBasedUUIDGenerator.java | 0 .../org/elasticsearch/common/TriFunction.java | 0 .../elasticsearch/common/UUIDGenerator.java | 0 .../java/org/elasticsearch/common/UUIDs.java | 0 .../common/ValidationException.java | 0 .../common/blobstore/BlobContainer.java | 0 .../common/blobstore/BlobMetaData.java | 0 .../common/blobstore/BlobPath.java | 0 .../common/blobstore/BlobStore.java | 0 .../common/blobstore/BlobStoreException.java | 0 .../common/blobstore/fs/FsBlobContainer.java | 0 .../common/blobstore/fs/FsBlobStore.java | 0 .../support/AbstractBlobContainer.java | 0 .../blobstore/support/PlainBlobMetaData.java | 0 .../breaker/ChildMemoryCircuitBreaker.java | 0 .../common/breaker/CircuitBreaker.java | 0 .../breaker/CircuitBreakingException.java | 0 .../common/breaker/MemoryCircuitBreaker.java | 0 .../common/breaker/NoopCircuitBreaker.java | 0 .../common/bytes/ByteBufferReference.java | 0 .../common/bytes/BytesArray.java | 0 .../common/bytes/BytesReference.java | 0 .../bytes/BytesReferenceStreamInput.java | 0 .../common/bytes/CompositeBytesReference.java | 0 .../common/bytes/PagedBytesReference.java | 0 .../bytes/ReleasablePagedBytesReference.java | 0 .../org/elasticsearch/common/cache/Cache.java | 0 .../common/cache/CacheBuilder.java | 0 .../common/cache/CacheLoader.java | 0 .../common/cache/RemovalListener.java | 0 .../common/cache/RemovalNotification.java | 0 .../common/collect/CopyOnWriteHashMap.java | 0 .../common/collect/EvictingQueue.java | 0 .../common/collect/HppcMaps.java | 0 .../common/collect/ImmutableOpenIntMap.java | 0 .../common/collect/ImmutableOpenMap.java | 0 .../common/collect/Iterators.java | 0 .../common/collect/MapBuilder.java | 0 .../elasticsearch/common/collect/Tuple.java | 0 .../common/component/AbstractComponent.java | 0 .../component/AbstractLifecycleComponent.java | 0 .../common/component/Lifecycle.java | 0 .../common/component/LifecycleComponent.java | 0 .../common/component/LifecycleListener.java | 0 .../common/compress/CompressedXContent.java | 0 .../common/compress/Compressor.java | 0 .../common/compress/CompressorFactory.java | 0 .../common/compress/DeflateCompressor.java | 0 .../compress/NotCompressedException.java | 0 .../common/compress/NotXContentException.java | 0 .../common/document/DocumentField.java | 0 .../elasticsearch/common/geo/GeoDistance.java | 0 .../common/geo/GeoHashUtils.java | 0 .../elasticsearch/common/geo/GeoPoint.java | 0 .../common/geo/GeoShapeType.java | 0 .../elasticsearch/common/geo/GeoUtils.java | 0 .../common/geo/ShapeRelation.java | 0 .../common/geo/ShapesAvailability.java | 0 .../common/geo/SpatialStrategy.java | 0 .../common/geo/XShapeCollection.java | 0 .../common/geo/builders/CircleBuilder.java | 0 .../geo/builders/CoordinatesBuilder.java | 0 .../common/geo/builders/EnvelopeBuilder.java | 0 .../builders/GeometryCollectionBuilder.java | 0 .../geo/builders/LineStringBuilder.java | 0 .../geo/builders/MultiLineStringBuilder.java | 0 .../geo/builders/MultiPointBuilder.java | 0 .../geo/builders/MultiPolygonBuilder.java | 0 .../common/geo/builders/PointBuilder.java | 0 .../common/geo/builders/PolygonBuilder.java | 0 .../common/geo/builders/ShapeBuilder.java | 0 .../common/geo/builders/ShapeBuilders.java | 0 .../common/geo/parsers/CoordinateNode.java | 0 .../common/geo/parsers/GeoJsonParser.java | 0 .../common/geo/parsers/GeoWKTParser.java | 0 .../common/geo/parsers/ShapeParser.java | 0 .../common/hash/MessageDigests.java | 0 .../common/hash/MurmurHash3.java | 0 .../common/inject/AbstractModule.java | 0 .../common/inject/AbstractProcessor.java | 0 .../elasticsearch/common/inject/Binder.java | 0 .../elasticsearch/common/inject/Binding.java | 0 .../common/inject/BindingAnnotation.java | 0 .../common/inject/BindingProcessor.java | 0 .../common/inject/BoundProviderFactory.java | 0 .../common/inject/ConfigurationException.java | 0 .../common/inject/ConstantFactory.java | 0 .../common/inject/ConstructionProxy.java | 0 .../inject/ConstructionProxyFactory.java | 0 .../common/inject/ConstructorBindingImpl.java | 0 .../common/inject/ConstructorInjector.java | 0 .../inject/ConstructorInjectorStore.java | 0 .../common/inject/ContextualCallable.java | 0 .../common/inject/CreationException.java | 0 .../DefaultConstructionProxyFactory.java | 0 .../common/inject/DeferredLookups.java | 0 .../common/inject/EncounterImpl.java | 0 .../elasticsearch/common/inject/Exposed.java | 0 .../common/inject/ExposedKeyFactory.java | 0 .../common/inject/FactoryProxy.java | 0 .../elasticsearch/common/inject/Guice.java | 0 .../common/inject/ImplementedBy.java | 0 .../common/inject/InheritingState.java | 0 .../common/inject/Initializable.java | 0 .../common/inject/Initializables.java | 0 .../common/inject/Initializer.java | 0 .../elasticsearch/common/inject/Inject.java | 0 .../inject/InjectionRequestProcessor.java | 0 .../elasticsearch/common/inject/Injector.java | 0 .../common/inject/InjectorBuilder.java | 0 .../common/inject/InjectorImpl.java | 0 .../common/inject/InjectorShell.java | 0 .../InternalFactoryToProviderAdapter.java | 0 .../org/elasticsearch/common/inject/Key.java | 0 .../common/inject/LookupProcessor.java | 0 .../elasticsearch/common/inject/Lookups.java | 0 .../common/inject/MembersInjector.java | 0 .../common/inject/MembersInjectorImpl.java | 0 .../common/inject/MembersInjectorStore.java | 0 .../common/inject/MessageProcessor.java | 0 .../elasticsearch/common/inject/Module.java | 0 .../common/inject/ModulesBuilder.java | 0 .../common/inject/OutOfScopeException.java | 0 .../common/inject/PreProcessModule.java | 0 .../common/inject/PrivateBinder.java | 0 .../inject/PrivateElementProcessor.java | 0 .../common/inject/PrivateModule.java | 0 .../common/inject/ProvidedBy.java | 0 .../elasticsearch/common/inject/Provider.java | 0 .../ProviderToInternalFactoryAdapter.java | 0 .../elasticsearch/common/inject/Provides.java | 0 .../common/inject/ProvisionException.java | 0 .../common/inject/Reflection.java | 0 .../elasticsearch/common/inject/Scope.java | 0 .../common/inject/ScopeAnnotation.java | 0 .../common/inject/ScopeBindingProcessor.java | 0 .../elasticsearch/common/inject/Scopes.java | 0 .../common/inject/SingleFieldInjector.java | 0 .../common/inject/SingleMemberInjector.java | 0 .../common/inject/SingleMethodInjector.java | 0 .../inject/SingleParameterInjector.java | 0 .../common/inject/Singleton.java | 0 .../elasticsearch/common/inject/Stage.java | 0 .../elasticsearch/common/inject/State.java | 0 .../inject/TypeConverterBindingProcessor.java | 0 .../inject/TypeListenerBindingProcessor.java | 0 .../common/inject/TypeLiteral.java | 0 .../common/inject/WeakKeySet.java | 0 .../inject/assistedinject/Assisted.java | 0 .../assistedinject/AssistedConstructor.java | 0 .../inject/assistedinject/AssistedInject.java | 0 .../assistedinject/FactoryProvider.java | 0 .../inject/assistedinject/Parameter.java | 0 .../assistedinject/ParameterListKey.java | 0 .../inject/assistedinject/package-info.java | 0 .../binder/AnnotatedBindingBuilder.java | 0 .../AnnotatedConstantBindingBuilder.java | 0 .../binder/AnnotatedElementBuilder.java | 0 .../inject/binder/ConstantBindingBuilder.java | 0 .../inject/binder/LinkedBindingBuilder.java | 0 .../inject/binder/ScopedBindingBuilder.java | 0 .../common/inject/binder/package-info.java | 0 .../internal/AbstractBindingBuilder.java | 0 .../common/inject/internal/Annotations.java | 0 .../AsynchronousComputationException.java | 0 .../inject/internal/BindingBuilder.java | 0 .../common/inject/internal/BindingImpl.java | 0 .../inject/internal/ComputationException.java | 0 .../internal/ConstantBindingBuilderImpl.java | 0 .../inject/internal/ConstructionContext.java | 0 .../common/inject/internal/ErrorHandler.java | 0 .../common/inject/internal/Errors.java | 0 .../inject/internal/ErrorsException.java | 0 .../inject/internal/ExpirationTimer.java | 0 .../inject/internal/ExposedBindingImpl.java | 0 .../inject/internal/ExposureBuilder.java | 0 .../common/inject/internal/FailableCache.java | 0 .../inject/internal/InstanceBindingImpl.java | 0 .../inject/internal/InternalContext.java | 0 .../inject/internal/InternalFactory.java | 0 .../common/inject/internal/Join.java | 0 .../inject/internal/LinkedBindingImpl.java | 0 .../internal/LinkedProviderBindingImpl.java | 0 .../inject/internal/MatcherAndConverter.java | 0 .../common/inject/internal/MoreTypes.java | 0 .../inject/internal/NullOutputException.java | 0 .../common/inject/internal/Nullability.java | 0 .../common/inject/internal/Nullable.java | 0 .../inject/internal/PrivateElementsImpl.java | 0 .../internal/ProviderInstanceBindingImpl.java | 0 .../inject/internal/ProviderMethod.java | 0 .../internal/ProviderMethodsModule.java | 0 .../common/inject/internal/Scoping.java | 0 .../inject/internal/SourceProvider.java | 0 .../inject/internal/StackTraceElements.java | 0 .../common/inject/internal/Stopwatch.java | 0 .../common/inject/internal/Strings.java | 0 .../inject/internal/ToStringBuilder.java | 0 .../inject/internal/UniqueAnnotations.java | 0 .../internal/UntargettedBindingImpl.java | 0 .../common/inject/internal/package-info.java | 0 .../inject/matcher/AbstractMatcher.java | 0 .../common/inject/matcher/Matcher.java | 0 .../common/inject/matcher/Matchers.java | 0 .../common/inject/matcher/package-info.java | 0 .../common/inject/multibindings/Element.java | 0 .../inject/multibindings/MapBinder.java | 0 .../inject/multibindings/Multibinder.java | 0 .../inject/multibindings/RealElement.java | 0 .../inject/multibindings/package-info.java | 0 .../common/inject/name/Named.java | 0 .../common/inject/name/NamedImpl.java | 0 .../common/inject/name/Names.java | 0 .../common/inject/name/package-info.java | 0 .../common/inject/package-info.java | 0 .../inject/spi/BindingScopingVisitor.java | 0 .../inject/spi/BindingTargetVisitor.java | 0 .../common/inject/spi/ConstructorBinding.java | 0 .../inject/spi/ConvertedConstantBinding.java | 0 .../spi/DefaultBindingScopingVisitor.java | 0 .../spi/DefaultBindingTargetVisitor.java | 0 .../inject/spi/DefaultElementVisitor.java | 0 .../common/inject/spi/Dependency.java | 0 .../common/inject/spi/Element.java | 0 .../common/inject/spi/ElementVisitor.java | 0 .../common/inject/spi/Elements.java | 0 .../common/inject/spi/ExposedBinding.java | 0 .../common/inject/spi/HasDependencies.java | 0 .../common/inject/spi/InjectionListener.java | 0 .../common/inject/spi/InjectionPoint.java | 0 .../common/inject/spi/InjectionRequest.java | 0 .../common/inject/spi/InstanceBinding.java | 0 .../common/inject/spi/LinkedKeyBinding.java | 0 .../inject/spi/MembersInjectorLookup.java | 0 .../common/inject/spi/Message.java | 0 .../common/inject/spi/PrivateElements.java | 0 .../common/inject/spi/ProviderBinding.java | 0 .../inject/spi/ProviderInstanceBinding.java | 0 .../common/inject/spi/ProviderKeyBinding.java | 0 .../common/inject/spi/ProviderLookup.java | 0 .../inject/spi/ProviderWithDependencies.java | 0 .../common/inject/spi/ScopeBinding.java | 0 .../inject/spi/StaticInjectionRequest.java | 0 .../common/inject/spi/TypeConverter.java | 0 .../inject/spi/TypeConverterBinding.java | 0 .../common/inject/spi/TypeEncounter.java | 0 .../common/inject/spi/TypeListener.java | 0 .../inject/spi/TypeListenerBinding.java | 0 .../common/inject/spi/UntargettedBinding.java | 0 .../common/inject/spi/package-info.java | 0 .../common/inject/util/Modules.java | 0 .../common/inject/util/Providers.java | 0 .../common/inject/util/Types.java | 0 .../common/inject/util/package-info.java | 0 .../org/elasticsearch/common/io/Channels.java | 0 .../common/io/FastCharArrayReader.java | 0 .../common/io/FastCharArrayWriter.java | 0 .../common/io/FastStringReader.java | 0 .../common/io/FileSystemUtils.java | 0 .../elasticsearch/common/io/PathUtils.java | 0 .../org/elasticsearch/common/io/Streams.java | 0 .../common/io/UTF8StreamWriter.java | 0 .../io/stream/ByteBufferStreamInput.java | 0 .../common/io/stream/BytesStream.java | 0 .../common/io/stream/BytesStreamOutput.java | 0 .../io/stream/DataOutputStreamOutput.java | 0 .../common/io/stream/FilterStreamInput.java | 0 .../io/stream/InputStreamStreamInput.java | 0 .../common/io/stream/NamedWriteable.java | 0 .../NamedWriteableAwareStreamInput.java | 0 .../io/stream/NamedWriteableRegistry.java | 0 .../NotSerializableExceptionWrapper.java | 0 .../io/stream/OutputStreamStreamOutput.java | 0 .../stream/ReleasableBytesStreamOutput.java | 0 .../common/io/stream/StreamInput.java | 0 .../common/io/stream/StreamOutput.java | 0 .../common/io/stream/Streamable.java | 0 .../common/io/stream/Writeable.java | 0 .../common/io/stream/package-info.java | 0 .../common/joda/DateMathParser.java | 0 .../common/joda/FormatDateTimeFormatter.java | 0 .../org/elasticsearch/common/joda/Joda.java | 0 .../common/lease/Releasable.java | 0 .../common/lease/Releasables.java | 0 .../common/logging/DeprecationLogger.java | 0 .../common/logging/ESLoggerFactory.java | 0 .../common/logging/LogConfigurator.java | 0 .../common/logging/LoggerMessageFormat.java | 0 .../elasticsearch/common/logging/Loggers.java | 0 .../common/logging/PrefixLogger.java | 0 .../common/lucene/BytesRefs.java | 0 .../common/lucene/LoggerInfoStream.java | 0 .../elasticsearch/common/lucene/Lucene.java | 0 .../common/lucene/MinimumScoreCollector.java | 0 .../common/lucene/ScorerAware.java | 0 .../common/lucene/ShardCoreKeyMap.java | 0 .../common/lucene/all/AllEntries.java | 0 .../common/lucene/all/AllField.java | 0 .../common/lucene/all/AllTermQuery.java | 0 .../common/lucene/all/AllTokenStream.java | 0 .../index/ElasticsearchDirectoryReader.java | 0 .../lucene/index/ElasticsearchLeafReader.java | 0 .../lucene/index/FilterableTermsEnum.java | 0 .../common/lucene/index/FreqTermsEnum.java | 0 .../lucene/search/FilteredCollector.java | 0 .../lucene/search/MoreLikeThisQuery.java | 0 .../lucene/search/MultiPhrasePrefixQuery.java | 0 .../common/lucene/search/Queries.java | 0 .../common/lucene/search/XMoreLikeThis.java | 0 .../search/function/CombineFunction.java | 0 .../function/FieldValueFactorFunction.java | 0 .../search/function/FunctionScoreQuery.java | 0 .../search/function/LeafScoreFunction.java | 0 .../search/function/MinScoreScorer.java | 0 .../search/function/RandomScoreFunction.java | 0 .../lucene/search/function/ScoreFunction.java | 0 .../search/function/ScriptScoreFunction.java | 0 .../search/function/WeightFactorFunction.java | 0 .../lucene/store/ByteArrayIndexInput.java | 0 .../lucene/store/FilterIndexOutput.java | 0 .../lucene/store/IndexOutputOutputStream.java | 0 .../lucene/store/InputStreamIndexInput.java | 0 .../uid/PerThreadIDVersionAndSeqNoLookup.java | 0 .../common/lucene/uid/Versions.java | 0 .../lucene/uid/VersionsAndSeqNoResolver.java | 0 .../common/metrics/CounterMetric.java | 0 .../common/metrics/MeanMetric.java | 0 .../elasticsearch/common/metrics/Metric.java | 0 .../elasticsearch/common/network/Cidrs.java | 0 .../common/network/IfConfig.java | 0 .../common/network/InetAddresses.java | 0 .../common/network/NetworkAddress.java | 0 .../common/network/NetworkModule.java | 0 .../common/network/NetworkService.java | 0 .../common/network/NetworkUtils.java | 0 .../elasticsearch/common/path/PathTrie.java | 0 .../common/recycler/AbstractRecycler.java | 0 .../common/recycler/AbstractRecyclerC.java | 0 .../recycler/ConcurrentDequeRecycler.java | 0 .../common/recycler/DequeRecycler.java | 0 .../common/recycler/FilterRecycler.java | 0 .../common/recycler/NoneRecycler.java | 0 .../common/recycler/Recycler.java | 0 .../common/recycler/Recyclers.java | 0 .../org/elasticsearch/common/regex/Regex.java | 0 .../common/rounding/DateTimeUnit.java | 0 .../common/rounding/Rounding.java | 0 .../settings/AbstractScopedSettings.java | 0 .../settings/AddFileKeyStoreCommand.java | 0 .../settings/AddStringKeyStoreCommand.java | 0 .../common/settings/ClusterSettings.java | 0 .../settings/CreateKeyStoreCommand.java | 0 .../common/settings/IndexScopedSettings.java | 0 .../common/settings/KeyStoreCli.java | 0 .../common/settings/KeyStoreWrapper.java | 0 .../common/settings/ListKeyStoreCommand.java | 0 .../settings/NoClassSettingsException.java | 0 .../common/settings/PropertyPlaceholder.java | 0 .../RemoveSettingKeyStoreCommand.java | 0 .../common/settings/SecureSetting.java | 0 .../common/settings/SecureSettings.java | 0 .../common/settings/SecureString.java | 0 .../common/settings/Setting.java | 0 .../common/settings/Settings.java | 0 .../common/settings/SettingsException.java | 0 .../common/settings/SettingsFilter.java | 0 .../common/settings/SettingsModule.java | 0 .../common/settings/package-info.java | 0 .../org/elasticsearch/common/text/Text.java | 0 .../transport/BoundTransportAddress.java | 0 .../transport/NetworkExceptionHelper.java | 0 .../common/transport/PortsRange.java | 0 .../common/transport/TransportAddress.java | 0 .../common/unit/ByteSizeUnit.java | 0 .../common/unit/ByteSizeValue.java | 0 .../common/unit/DistanceUnit.java | 0 .../elasticsearch/common/unit/Fuzziness.java | 0 .../common/unit/MemorySizeValue.java | 0 .../elasticsearch/common/unit/RatioValue.java | 0 .../elasticsearch/common/unit/SizeUnit.java | 0 .../elasticsearch/common/unit/SizeValue.java | 0 .../elasticsearch/common/unit/TimeValue.java | 0 .../common/util/AbstractArray.java | 0 .../common/util/AbstractBigArray.java | 0 .../common/util/AbstractHash.java | 0 .../common/util/AbstractPagedHashMap.java | 0 .../elasticsearch/common/util/ArrayUtils.java | 0 .../elasticsearch/common/util/BigArray.java | 0 .../elasticsearch/common/util/BigArrays.java | 0 .../common/util/BigByteArray.java | 0 .../common/util/BigDoubleArray.java | 0 .../common/util/BigFloatArray.java | 0 .../common/util/BigIntArray.java | 0 .../common/util/BigLongArray.java | 0 .../common/util/BigObjectArray.java | 0 .../elasticsearch/common/util/ByteArray.java | 0 .../elasticsearch/common/util/ByteUtils.java | 0 .../common/util/BytesRefHash.java | 0 .../common/util/CancellableThreads.java | 0 .../common/util/CollectionUtils.java | 0 .../common/util/Comparators.java | 0 .../common/util/DoubleArray.java | 0 .../elasticsearch/common/util/FloatArray.java | 0 .../common/util/IndexFolderUpgrader.java | 0 .../elasticsearch/common/util/IntArray.java | 0 .../common/util/LocaleUtils.java | 0 .../elasticsearch/common/util/LongArray.java | 0 .../elasticsearch/common/util/LongHash.java | 0 .../common/util/LongObjectPagedHashMap.java | 0 .../common/util/ObjectArray.java | 0 .../common/util/PageCacheRecycler.java | 0 .../common/util/SingleObjectCache.java | 0 .../elasticsearch/common/util/URIPattern.java | 0 .../concurrent/AbstractLifecycleRunnable.java | 0 .../util/concurrent/AbstractRefCounted.java | 0 .../util/concurrent/AbstractRunnable.java | 0 .../util/concurrent/AsyncIOProcessor.java | 0 .../common/util/concurrent/AtomicArray.java | 0 .../common/util/concurrent/BaseFuture.java | 0 .../concurrent/ConcurrentCollections.java | 0 .../concurrent/ConcurrentHashMapLong.java | 0 .../util/concurrent/ConcurrentMapLong.java | 0 .../common/util/concurrent/CountDown.java | 0 .../common/util/concurrent/EsAbortPolicy.java | 0 .../common/util/concurrent/EsExecutors.java | 0 .../EsRejectedExecutionException.java | 0 .../util/concurrent/EsThreadPoolExecutor.java | 0 .../common/util/concurrent/FutureUtils.java | 0 .../common/util/concurrent/KeyedLock.java | 0 .../util/concurrent/LoggingRunnable.java | 0 .../util/concurrent/PrioritizedCallable.java | 0 .../PrioritizedEsThreadPoolExecutor.java | 0 .../util/concurrent/PrioritizedRunnable.java | 0 .../QueueResizingEsThreadPoolExecutor.java | 0 .../common/util/concurrent/RefCounted.java | 0 .../util/concurrent/ReleasableLock.java | 0 .../concurrent/ResizableBlockingQueue.java | 0 .../util/concurrent/SizeBlockingQueue.java | 0 .../common/util/concurrent/ThreadBarrier.java | 0 .../common/util/concurrent/ThreadContext.java | 0 .../common/util/concurrent/TimedRunnable.java | 0 .../UncategorizedExecutionException.java | 0 .../concurrent/XRejectedExecutionHandler.java | 0 .../common/util/iterable/Iterables.java | 0 .../elasticsearch/common/util/set/Sets.java | 0 .../common/xcontent/AbstractObjectParser.java | 0 .../xcontent/ConstructingObjectParser.java | 0 .../common/xcontent/ContextParser.java | 0 .../xcontent/NamedXContentRegistry.java | 0 .../common/xcontent/ObjectParser.java | 0 .../common/xcontent/ParseFieldRegistry.java | 0 .../xcontent/StatusToXContentObject.java | 0 .../common/xcontent/ToXContent.java | 0 .../common/xcontent/ToXContentFragment.java | 0 .../common/xcontent/ToXContentObject.java | 0 .../common/xcontent/XContent.java | 0 .../common/xcontent/XContentBuilder.java | 0 .../common/xcontent/XContentFactory.java | 0 .../common/xcontent/XContentGenerator.java | 0 .../common/xcontent/XContentHelper.java | 0 .../common/xcontent/XContentLocation.java | 0 .../common/xcontent/XContentParser.java | 0 .../common/xcontent/XContentParserUtils.java | 0 .../common/xcontent/XContentType.java | 0 .../common/xcontent/cbor/CborXContent.java | 0 .../xcontent/cbor/CborXContentGenerator.java | 0 .../xcontent/cbor/CborXContentParser.java | 0 .../common/xcontent/json/JsonXContent.java | 0 .../xcontent/json/JsonXContentGenerator.java | 0 .../xcontent/json/JsonXContentParser.java | 0 .../common/xcontent/smile/SmileXContent.java | 0 .../smile/SmileXContentGenerator.java | 0 .../xcontent/smile/SmileXContentParser.java | 0 .../support/AbstractXContentParser.java | 0 .../xcontent/support/XContentMapValues.java | 0 .../support/filtering/FilterPath.java | 0 .../filtering/FilterPathBasedFilter.java | 0 .../common/xcontent/yaml/YamlXContent.java | 0 .../xcontent/yaml/YamlXContentGenerator.java | 0 .../xcontent/yaml/YamlXContentParser.java | 0 ...AckClusterStatePublishResponseHandler.java | 0 ...ingClusterStatePublishResponseHandler.java | 0 .../elasticsearch/discovery/Discovery.java | 0 .../discovery/DiscoveryModule.java | 0 .../discovery/DiscoverySettings.java | 0 .../discovery/DiscoveryStats.java | 0 .../MasterNotDiscoveredException.java | 0 .../discovery/single/SingleNodeDiscovery.java | 0 .../discovery/zen/ElectMasterService.java | 0 .../discovery/zen/FaultDetection.java | 0 .../discovery/zen/MasterFaultDetection.java | 0 .../discovery/zen/MembershipAction.java | 0 .../discovery/zen/NodeJoinController.java | 0 .../discovery/zen/NodesFaultDetection.java | 0 .../zen/PendingClusterStateStats.java | 0 .../zen/PendingClusterStatesQueue.java | 0 .../discovery/zen/PingContextProvider.java | 0 .../zen/PublishClusterStateAction.java | 0 .../zen/PublishClusterStateStats.java | 0 .../discovery/zen/UnicastHostsProvider.java | 0 .../discovery/zen/UnicastZenPing.java | 0 .../discovery/zen/ZenDiscovery.java | 0 .../elasticsearch/discovery/zen/ZenPing.java | 0 .../org/elasticsearch/env/ESFileStore.java | 0 .../org/elasticsearch/env/Environment.java | 0 .../elasticsearch/env/NodeEnvironment.java | 0 .../org/elasticsearch/env/NodeMetaData.java | 0 .../java/org/elasticsearch/env/ShardLock.java | 0 .../env/ShardLockObtainFailedException.java | 0 .../gateway/AsyncShardFetch.java | 0 .../gateway/BaseGatewayShardAllocator.java | 0 .../gateway/CorruptStateException.java | 0 .../gateway/DanglingIndicesState.java | 0 .../org/elasticsearch/gateway/Gateway.java | 0 .../gateway/GatewayAllocator.java | 0 .../gateway/GatewayException.java | 0 .../gateway/GatewayMetaState.java | 0 .../elasticsearch/gateway/GatewayModule.java | 0 .../elasticsearch/gateway/GatewayService.java | 0 .../gateway/LocalAllocateDangledIndices.java | 0 .../gateway/MetaDataStateFormat.java | 0 .../gateway/MetaStateService.java | 0 .../gateway/PrimaryShardAllocator.java | 0 .../gateway/PriorityComparator.java | 0 .../gateway/ReplicaShardAllocator.java | 0 .../TransportNodesListGatewayMetaState.java | 0 ...ransportNodesListGatewayStartedShards.java | 0 .../elasticsearch/http/BindHttpException.java | 0 .../org/elasticsearch/http/HttpException.java | 0 .../java/org/elasticsearch/http/HttpInfo.java | 0 .../http/HttpServerTransport.java | 0 .../org/elasticsearch/http/HttpStats.java | 0 .../http/HttpTransportSettings.java | 0 .../index/AbstractIndexComponent.java | 0 .../index/CompositeIndexEventListener.java | 0 .../java/org/elasticsearch/index/Index.java | 0 .../elasticsearch/index/IndexComponent.java | 0 .../org/elasticsearch/index/IndexModule.java | 0 .../index/IndexNotFoundException.java | 0 .../org/elasticsearch/index/IndexService.java | 0 .../elasticsearch/index/IndexSettings.java | 0 .../elasticsearch/index/IndexSortConfig.java | 0 .../org/elasticsearch/index/IndexWarmer.java | 0 .../elasticsearch/index/IndexingSlowLog.java | 0 .../index/MergePolicyConfig.java | 0 .../index/MergeSchedulerConfig.java | 0 .../elasticsearch/index/SearchSlowLog.java | 0 .../org/elasticsearch/index/SlowLogLevel.java | 0 .../org/elasticsearch/index/VersionType.java | 0 .../analysis/AbstractCharFilterFactory.java | 0 .../AbstractIndexAnalyzerProvider.java | 0 .../analysis/AbstractTokenFilterFactory.java | 0 .../analysis/AbstractTokenizerFactory.java | 0 .../index/analysis/Analysis.java | 0 .../index/analysis/AnalysisRegistry.java | 0 .../index/analysis/AnalyzerProvider.java | 0 .../index/analysis/AnalyzerScope.java | 0 .../analysis/ArabicAnalyzerProvider.java | 0 .../analysis/ArmenianAnalyzerProvider.java | 0 .../analysis/BasqueAnalyzerProvider.java | 0 .../analysis/BengaliAnalyzerProvider.java | 0 .../analysis/BrazilianAnalyzerProvider.java | 0 .../analysis/BulgarianAnalyzerProvider.java | 0 .../analysis/CatalanAnalyzerProvider.java | 0 .../index/analysis/CharFilterFactory.java | 0 .../index/analysis/CharMatcher.java | 0 .../analysis/ChineseAnalyzerProvider.java | 0 .../index/analysis/CjkAnalyzerProvider.java | 0 .../analysis/ClassicTokenizerFactory.java | 0 .../index/analysis/CustomAnalyzer.java | 0 .../analysis/CustomAnalyzerProvider.java | 0 .../analysis/CustomNormalizerProvider.java | 0 .../index/analysis/CzechAnalyzerProvider.java | 0 .../analysis/DanishAnalyzerProvider.java | 0 .../index/analysis/DutchAnalyzerProvider.java | 0 .../analysis/EdgeNGramTokenizerFactory.java | 0 .../analysis/EnglishAnalyzerProvider.java | 0 .../index/analysis/FieldNameAnalyzer.java | 0 .../index/analysis/FingerprintAnalyzer.java | 0 .../analysis/FingerprintAnalyzerProvider.java | 0 .../analysis/FinnishAnalyzerProvider.java | 0 .../analysis/FrenchAnalyzerProvider.java | 0 .../analysis/GalicianAnalyzerProvider.java | 0 .../analysis/GermanAnalyzerProvider.java | 0 .../index/analysis/GreekAnalyzerProvider.java | 0 .../index/analysis/HindiAnalyzerProvider.java | 0 .../analysis/HungarianAnalyzerProvider.java | 0 .../analysis/HunspellTokenFilterFactory.java | 0 .../index/analysis/IndexAnalyzers.java | 0 .../analysis/IndonesianAnalyzerProvider.java | 0 .../index/analysis/IrishAnalyzerProvider.java | 0 .../analysis/ItalianAnalyzerProvider.java | 0 .../analysis/KeywordAnalyzerProvider.java | 0 .../analysis/KeywordTokenizerFactory.java | 0 .../analysis/LatvianAnalyzerProvider.java | 0 .../analysis/LetterTokenizerFactory.java | 0 .../analysis/LithuanianAnalyzerProvider.java | 0 .../analysis/LowerCaseTokenizerFactory.java | 0 .../analysis/MultiTermAwareComponent.java | 0 .../index/analysis/NGramTokenizerFactory.java | 0 .../index/analysis/NamedAnalyzer.java | 0 .../analysis/NorwegianAnalyzerProvider.java | 0 .../PathHierarchyTokenizerFactory.java | 0 .../index/analysis/PatternAnalyzer.java | 0 .../analysis/PatternAnalyzerProvider.java | 0 .../analysis/PatternTokenizerFactory.java | 0 .../analysis/PersianAnalyzerProvider.java | 0 .../analysis/PortugueseAnalyzerProvider.java | 0 .../analysis/PreBuiltAnalyzerProvider.java | 0 .../PreBuiltAnalyzerProviderFactory.java | 0 .../PreConfiguredAnalysisComponent.java | 0 .../analysis/PreConfiguredCharFilter.java | 0 .../analysis/PreConfiguredTokenFilter.java | 0 .../analysis/PreConfiguredTokenizer.java | 0 .../analysis/RomanianAnalyzerProvider.java | 0 .../analysis/RussianAnalyzerProvider.java | 0 .../analysis/ShingleTokenFilterFactory.java | 0 .../analysis/SimpleAnalyzerProvider.java | 0 .../index/analysis/SnowballAnalyzer.java | 0 .../analysis/SnowballAnalyzerProvider.java | 0 .../analysis/SoraniAnalyzerProvider.java | 0 .../SoraniNormalizationFilterFactory.java | 0 .../analysis/SpanishAnalyzerProvider.java | 0 .../analysis/StandardAnalyzerProvider.java | 0 .../analysis/StandardHtmlStripAnalyzer.java | 0 .../StandardHtmlStripAnalyzerProvider.java | 0 .../analysis/StandardTokenFilterFactory.java | 0 .../analysis/StandardTokenizerFactory.java | 0 .../index/analysis/StopAnalyzerProvider.java | 0 .../analysis/StopTokenFilterFactory.java | 0 .../analysis/SwedishAnalyzerProvider.java | 0 .../SynonymGraphTokenFilterFactory.java | 0 .../analysis/SynonymTokenFilterFactory.java | 0 .../index/analysis/ThaiAnalyzerProvider.java | 0 .../index/analysis/ThaiTokenizerFactory.java | 0 .../index/analysis/TokenFilterFactory.java | 0 .../index/analysis/TokenizerFactory.java | 0 .../analysis/TurkishAnalyzerProvider.java | 0 .../UAX29URLEmailTokenizerFactory.java | 0 .../analysis/WhitespaceAnalyzerProvider.java | 0 .../analysis/WhitespaceTokenizerFactory.java | 0 .../elasticsearch/index/cache/IndexCache.java | 0 .../index/cache/bitset/BitsetFilterCache.java | 0 .../cache/bitset/ShardBitsetFilterCache.java | 0 .../index/cache/query/DisabledQueryCache.java | 0 .../index/cache/query/IndexQueryCache.java | 0 .../index/cache/query/QueryCache.java | 0 .../index/cache/query/QueryCacheStats.java | 0 .../cache/request/RequestCacheStats.java | 0 .../cache/request/ShardRequestCache.java | 0 .../index/codec/CodecService.java | 0 .../PerFieldMappingPostingFormatCodec.java | 0 .../index/engine/CombinedDeletionPolicy.java | 0 .../index/engine/CommitStats.java | 0 .../engine/DeleteFailedEngineException.java | 0 .../index/engine/DeleteVersionValue.java | 0 .../engine/DocumentMissingException.java | 0 .../DocumentSourceMissingException.java | 0 ...ElasticsearchConcurrentMergeScheduler.java | 0 .../elasticsearch/index/engine/Engine.java | 0 .../index/engine/EngineConfig.java | 0 .../EngineCreationFailureException.java | 0 .../index/engine/EngineException.java | 0 .../index/engine/EngineFactory.java | 0 .../index/engine/EngineSearcher.java | 0 .../index/engine/EngineSearcherFactory.java | 0 .../engine/FlushFailedEngineException.java | 0 .../engine/IndexFailedEngineException.java | 0 .../index/engine/InternalEngine.java | 0 .../index/engine/InternalEngineFactory.java | 0 .../index/engine/LiveVersionMap.java | 0 .../engine/RamAccountingSearcherFactory.java | 0 .../index/engine/RecoveryCounter.java | 0 .../index/engine/RecoveryEngineException.java | 0 .../engine/RefreshFailedEngineException.java | 0 .../elasticsearch/index/engine/Segment.java | 0 .../index/engine/SegmentsStats.java | 0 .../engine/SnapshotFailedEngineException.java | 0 .../VersionConflictEngineException.java | 0 .../index/engine/VersionValue.java | 0 .../fielddata/AbstractBinaryDocValues.java | 0 .../fielddata/AbstractNumericDocValues.java | 0 .../fielddata/AbstractSortedDocValues.java | 0 .../AbstractSortedNumericDocValues.java | 0 .../fielddata/AbstractSortedSetDocValues.java | 0 .../AbstractSortingNumericDocValues.java | 0 .../index/fielddata/AtomicFieldData.java | 0 .../fielddata/AtomicGeoPointFieldData.java | 0 .../fielddata/AtomicNumericFieldData.java | 0 .../fielddata/AtomicOrdinalsFieldData.java | 0 .../index/fielddata/FieldData.java | 0 .../index/fielddata/FieldDataStats.java | 0 .../index/fielddata/GeoPointValues.java | 0 .../index/fielddata/IndexFieldData.java | 0 .../index/fielddata/IndexFieldDataCache.java | 0 .../fielddata/IndexFieldDataService.java | 0 .../fielddata/IndexGeoPointFieldData.java | 0 .../fielddata/IndexNumericFieldData.java | 0 .../fielddata/IndexOrdinalsFieldData.java | 0 .../index/fielddata/MultiGeoPointValues.java | 0 .../index/fielddata/NumericDoubleValues.java | 0 .../fielddata/RamAccountingTermsEnum.java | 0 .../index/fielddata/ScriptDocValues.java | 0 .../index/fielddata/ShardFieldData.java | 0 .../SingletonMultiGeoPointValues.java | 0 .../SingletonSortedBinaryDocValues.java | 0 .../SingletonSortedNumericDoubleValues.java | 0 .../SortableLongBitsNumericDocValues.java | 0 ...ortableLongBitsSortedNumericDocValues.java | 0 ...SortableLongBitsToNumericDoubleValues.java | 0 ...leLongBitsToSortedNumericDoubleValues.java | 0 .../fielddata/SortedBinaryDocValues.java | 0 .../fielddata/SortedNumericDoubleValues.java | 0 .../fielddata/SortingBinaryDocValues.java | 0 .../fielddata/SortingNumericDocValues.java | 0 .../fielddata/SortingNumericDoubleValues.java | 0 .../index/fielddata/UidIndexFieldData.java | 0 .../BytesRefFieldComparatorSource.java | 0 .../DoubleValuesComparatorSource.java | 0 .../FloatValuesComparatorSource.java | 0 .../LongValuesComparatorSource.java | 0 .../ordinals/GlobalOrdinalMapping.java | 0 .../ordinals/GlobalOrdinalsBuilder.java | 0 .../GlobalOrdinalsIndexFieldData.java | 0 .../fielddata/ordinals/MultiOrdinals.java | 0 .../index/fielddata/ordinals/Ordinals.java | 0 .../fielddata/ordinals/OrdinalsBuilder.java | 0 .../ordinals/SinglePackedOrdinals.java | 0 .../AbstractAtomicGeoPointFieldData.java | 0 .../AbstractAtomicOrdinalsFieldData.java | 0 .../plain/AbstractIndexFieldData.java | 0 .../plain/AbstractIndexOrdinalsFieldData.java | 0 .../AbstractLatLonPointDVIndexFieldData.java | 0 .../plain/AtomicDoubleFieldData.java | 0 .../fielddata/plain/AtomicLongFieldData.java | 0 .../plain/BinaryDVAtomicFieldData.java | 0 .../plain/BinaryDVIndexFieldData.java | 0 .../plain/BytesBinaryDVAtomicFieldData.java | 0 .../plain/BytesBinaryDVIndexFieldData.java | 0 .../plain/ConstantIndexFieldData.java | 0 .../plain/DocValuesIndexFieldData.java | 0 .../plain/LatLonPointDVAtomicFieldData.java | 0 .../plain/NonEstimatingEstimator.java | 0 .../plain/PagedBytesAtomicFieldData.java | 0 .../plain/PagedBytesIndexFieldData.java | 0 .../plain/SortedNumericDVIndexFieldData.java | 0 .../SortedSetDVBytesAtomicFieldData.java | 0 .../SortedSetDVOrdinalsIndexFieldData.java | 0 .../fieldvisitor/CustomFieldsVisitor.java | 0 .../index/fieldvisitor/FieldsVisitor.java | 0 .../fieldvisitor/SingleFieldsVisitor.java | 0 .../elasticsearch/index/flush/FlushStats.java | 0 .../elasticsearch/index/get/GetResult.java | 0 .../org/elasticsearch/index/get/GetStats.java | 0 .../index/get/ShardGetService.java | 0 .../index/mapper/AllFieldMapper.java | 0 .../index/mapper/ArrayValueMapperParser.java | 0 .../index/mapper/BinaryFieldMapper.java | 0 .../index/mapper/BinaryRangeUtil.java | 0 .../index/mapper/BooleanFieldMapper.java | 0 .../index/mapper/CompletionFieldMapper.java | 0 .../index/mapper/ContentPath.java | 0 .../index/mapper/CustomDocValuesField.java | 0 .../index/mapper/DateFieldMapper.java | 0 .../index/mapper/DocumentFieldMappers.java | 0 .../index/mapper/DocumentMapper.java | 0 .../index/mapper/DocumentMapperForType.java | 0 .../index/mapper/DocumentMapperParser.java | 0 .../index/mapper/DocumentParser.java | 0 .../index/mapper/DynamicTemplate.java | 0 .../index/mapper/EnabledAttributeMapper.java | 0 .../index/mapper/FieldMapper.java | 0 .../index/mapper/FieldNamesFieldMapper.java | 0 .../index/mapper/FieldTypeLookup.java | 0 .../index/mapper/GeoPointFieldMapper.java | 0 .../index/mapper/GeoShapeFieldMapper.java | 0 .../index/mapper/IdFieldMapper.java | 0 .../index/mapper/IndexFieldMapper.java | 0 .../index/mapper/IpFieldMapper.java | 0 .../index/mapper/KeywordFieldMapper.java | 0 .../index/mapper/MappedFieldType.java | 0 .../elasticsearch/index/mapper/Mapper.java | 0 .../index/mapper/MapperException.java | 0 .../index/mapper/MapperParsingException.java | 0 .../index/mapper/MapperService.java | 0 .../index/mapper/MapperUtils.java | 0 .../elasticsearch/index/mapper/Mapping.java | 0 .../index/mapper/MetadataFieldMapper.java | 0 .../index/mapper/NumberFieldMapper.java | 0 .../index/mapper/ObjectMapper.java | 0 .../index/mapper/ParentFieldMapper.java | 0 .../index/mapper/ParseContext.java | 0 .../index/mapper/ParsedDocument.java | 0 .../index/mapper/RangeFieldMapper.java | 0 .../index/mapper/RootObjectMapper.java | 0 .../index/mapper/RoutingFieldMapper.java | 0 .../index/mapper/SeqNoFieldMapper.java | 0 .../index/mapper/SimpleMappedFieldType.java | 0 .../index/mapper/SourceFieldMapper.java | 0 .../index/mapper/SourceToParse.java | 0 .../mapper/StrictDynamicMappingException.java | 0 .../index/mapper/StringFieldType.java | 0 .../index/mapper/TermBasedFieldType.java | 0 .../index/mapper/TextFieldMapper.java | 0 .../index/mapper/TypeFieldMapper.java | 0 .../index/mapper/TypeParsers.java | 0 .../org/elasticsearch/index/mapper/Uid.java | 0 .../index/mapper/UidFieldMapper.java | 0 .../index/mapper/VersionFieldMapper.java | 0 .../elasticsearch/index/merge/MergeStats.java | 0 .../index/merge/OnGoingMerge.java | 0 .../index/query/AbstractQueryBuilder.java | 0 .../index/query/BaseTermQueryBuilder.java | 0 .../index/query/BoolQueryBuilder.java | 0 .../index/query/BoostingQueryBuilder.java | 0 .../index/query/CommonTermsQueryBuilder.java | 0 .../query/ConstantScoreQueryBuilder.java | 0 .../index/query/DisMaxQueryBuilder.java | 0 .../index/query/ExistsQueryBuilder.java | 0 .../query/FieldMaskingSpanQueryBuilder.java | 0 .../index/query/FuzzyQueryBuilder.java | 0 .../query/GeoBoundingBoxQueryBuilder.java | 0 .../index/query/GeoDistanceQueryBuilder.java | 0 .../index/query/GeoExecType.java | 0 .../index/query/GeoPolygonQueryBuilder.java | 0 .../index/query/GeoShapeQueryBuilder.java | 0 .../index/query/GeoValidationMethod.java | 0 .../index/query/IdsQueryBuilder.java | 0 .../index/query/InnerHitBuilder.java | 0 .../index/query/InnerHitContextBuilder.java | 0 .../index/query/MatchAllQueryBuilder.java | 0 .../index/query/MatchNoneQueryBuilder.java | 0 .../query/MatchPhrasePrefixQueryBuilder.java | 0 .../index/query/MatchPhraseQueryBuilder.java | 0 .../index/query/MatchQueryBuilder.java | 0 .../index/query/MoreLikeThisQueryBuilder.java | 0 .../index/query/MultiMatchQueryBuilder.java | 0 .../index/query/MultiTermQueryBuilder.java | 0 .../index/query/NestedQueryBuilder.java | 0 .../elasticsearch/index/query/Operator.java | 0 .../index/query/ParsedQuery.java | 0 .../index/query/PrefixQueryBuilder.java | 0 .../index/query/QueryBuilder.java | 0 .../index/query/QueryBuilders.java | 0 .../index/query/QueryParser.java | 0 .../index/query/QueryRewriteContext.java | 0 .../index/query/QueryShardContext.java | 0 .../index/query/QueryShardException.java | 0 .../index/query/QueryStringQueryBuilder.java | 0 .../index/query/QueryValidationException.java | 0 .../index/query/RangeQueryBuilder.java | 0 .../elasticsearch/index/query/RegexpFlag.java | 0 .../index/query/RegexpQueryBuilder.java | 0 .../index/query/Rewriteable.java | 0 .../index/query/ScriptQueryBuilder.java | 0 .../index/query/SimpleQueryStringBuilder.java | 0 .../index/query/SimpleQueryStringFlag.java | 0 .../query/SpanContainingQueryBuilder.java | 0 .../index/query/SpanFirstQueryBuilder.java | 0 .../query/SpanMultiTermQueryBuilder.java | 0 .../index/query/SpanNearQueryBuilder.java | 0 .../index/query/SpanNotQueryBuilder.java | 0 .../index/query/SpanOrQueryBuilder.java | 0 .../index/query/SpanQueryBuilder.java | 0 .../index/query/SpanTermQueryBuilder.java | 0 .../index/query/SpanWithinQueryBuilder.java | 0 .../index/query/TermQueryBuilder.java | 0 .../index/query/TermsQueryBuilder.java | 0 .../index/query/TermsSetQueryBuilder.java | 0 .../index/query/TypeQueryBuilder.java | 0 .../index/query/WildcardQueryBuilder.java | 0 .../index/query/WrapperQueryBuilder.java | 0 .../query/functionscore/DecayFunction.java | 0 .../functionscore/DecayFunctionBuilder.java | 0 .../functionscore/DecayFunctionParser.java | 0 .../ExponentialDecayFunctionBuilder.java | 0 .../FieldValueFactorFunctionBuilder.java | 0 .../FunctionScoreQueryBuilder.java | 0 .../GaussDecayFunctionBuilder.java | 0 .../LinearDecayFunctionBuilder.java | 0 .../RandomScoreFunctionBuilder.java | 0 .../functionscore/ScoreFunctionBuilder.java | 0 .../functionscore/ScoreFunctionBuilders.java | 0 .../functionscore/ScoreFunctionParser.java | 0 .../ScriptScoreFunctionBuilder.java | 0 .../query/functionscore/WeightBuilder.java | 0 .../index/query/support/NestedScope.java | 0 .../index/query/support/QueryParsers.java | 0 .../index/recovery/RecoveryStats.java | 0 .../index/refresh/RefreshStats.java | 0 .../reindex/AbstractBulkByScrollRequest.java | 0 .../AbstractBulkByScrollRequestBuilder.java | 0 .../AbstractBulkIndexByScrollRequest.java | 0 ...stractBulkIndexByScrollRequestBuilder.java | 0 .../index/reindex/BulkByScrollResponse.java | 0 .../index/reindex/BulkByScrollTask.java | 0 .../reindex/ClientScrollableHitSource.java | 0 .../index/reindex/DeleteByQueryAction.java | 0 .../index/reindex/DeleteByQueryRequest.java | 0 .../reindex/DeleteByQueryRequestBuilder.java | 0 .../reindex/LeaderBulkByScrollTaskState.java | 0 .../index/reindex/ReindexAction.java | 0 .../index/reindex/ReindexRequest.java | 0 .../index/reindex/ReindexRequestBuilder.java | 0 .../index/reindex/RemoteInfo.java | 0 .../index/reindex/ScrollableHitSource.java | 0 .../index/reindex/SuccessfullyProcessed.java | 0 .../index/reindex/UpdateByQueryAction.java | 0 .../index/reindex/UpdateByQueryRequest.java | 0 .../reindex/UpdateByQueryRequestBuilder.java | 0 .../reindex/WorkerBulkByScrollTaskState.java | 0 .../search/ESToParentBlockJoinQuery.java | 0 .../index/search/MatchQuery.java | 0 .../index/search/MultiMatchQuery.java | 0 .../index/search/NestedHelper.java | 0 .../index/search/QueryParserHelper.java | 0 .../index/search/QueryStringQueryParser.java | 0 .../search/SimpleQueryStringQueryParser.java | 0 .../index/search/stats/SearchStats.java | 0 .../index/search/stats/ShardSearchStats.java | 0 .../index/seqno/CountedBitSet.java | 0 .../seqno/GlobalCheckpointSyncAction.java | 0 .../index/seqno/GlobalCheckpointTracker.java | 0 .../index/seqno/LocalCheckpointTracker.java | 0 .../elasticsearch/index/seqno/SeqNoStats.java | 0 .../index/seqno/SequenceNumbers.java | 0 .../index/settings/IndexDynamicSettings.java | 0 .../shard/AbstractIndexShardComponent.java | 0 .../elasticsearch/index/shard/DocsStats.java | 0 .../index/shard/ElasticsearchMergePolicy.java | 0 .../IllegalIndexShardStateException.java | 0 .../index/shard/IndexEventListener.java | 0 .../index/shard/IndexSearcherWrapper.java | 0 .../elasticsearch/index/shard/IndexShard.java | 0 .../shard/IndexShardClosedException.java | 0 .../index/shard/IndexShardComponent.java | 0 .../IndexShardNotRecoveringException.java | 0 .../shard/IndexShardNotStartedException.java | 0 .../shard/IndexShardOperationPermits.java | 0 .../shard/IndexShardRecoveringException.java | 0 .../shard/IndexShardRecoveryException.java | 0 .../shard/IndexShardRelocatedException.java | 0 .../shard/IndexShardStartedException.java | 0 .../index/shard/IndexShardState.java | 0 .../shard/IndexingOperationListener.java | 0 .../index/shard/IndexingStats.java | 0 .../index/shard/InternalIndexingStats.java | 0 .../index/shard/LocalShardSnapshot.java | 0 .../index/shard/PrimaryReplicaSyncer.java | 0 .../index/shard/RefreshListeners.java | 0 .../index/shard/ReplicationGroup.java | 0 .../index/shard/SearchOperationListener.java | 0 .../elasticsearch/index/shard/ShardId.java | 0 .../index/shard/ShardNotFoundException.java | 0 .../elasticsearch/index/shard/ShardPath.java | 0 .../index/shard/ShardSplittingQuery.java | 0 .../index/shard/ShardStateMetaData.java | 0 .../elasticsearch/index/shard/ShardUtils.java | 0 .../index/shard/StoreRecovery.java | 0 .../AbstractSimilarityProvider.java | 0 .../similarity/BM25SimilarityProvider.java | 0 .../similarity/BooleanSimilarityProvider.java | 0 .../similarity/ClassicSimilarityProvider.java | 0 .../similarity/DFISimilarityProvider.java | 0 .../similarity/DFRSimilarityProvider.java | 0 .../similarity/IBSimilarityProvider.java | 0 .../LMDirichletSimilarityProvider.java | 0 .../LMJelinekMercerSimilarityProvider.java | 0 .../index/similarity/ScriptedSimilarity.java | 0 .../ScriptedSimilarityProvider.java | 0 .../index/similarity/SimilarityProvider.java | 0 .../index/similarity/SimilarityService.java | 0 .../snapshots/IndexShardRestoreException.java | 0 .../IndexShardRestoreFailedException.java | 0 .../IndexShardSnapshotException.java | 0 .../IndexShardSnapshotFailedException.java | 0 .../snapshots/IndexShardSnapshotStatus.java | 0 .../BlobStoreIndexShardSnapshot.java | 0 .../BlobStoreIndexShardSnapshots.java | 0 .../blobstore/RateLimitingInputStream.java | 0 .../blobstore/SlicedInputStream.java | 0 .../snapshots/blobstore/SnapshotFiles.java | 0 .../index/store/DirectoryService.java | 0 .../index/store/DirectoryUtils.java | 0 .../index/store/FsDirectoryService.java | 0 .../elasticsearch/index/store/IndexStore.java | 0 .../org/elasticsearch/index/store/Store.java | 0 .../index/store/StoreFileMetaData.java | 0 .../elasticsearch/index/store/StoreStats.java | 0 .../index/store/VerifyingIndexOutput.java | 0 .../index/termvectors/TermVectorsService.java | 0 .../index/translog/BaseTranslogReader.java | 0 .../translog/BufferedChecksumStreamInput.java | 0 .../BufferedChecksumStreamOutput.java | 0 .../index/translog/ChannelFactory.java | 0 .../index/translog/Checkpoint.java | 0 .../index/translog/MultiSnapshot.java | 0 .../index/translog/Translog.java | 0 .../index/translog/TranslogConfig.java | 0 .../translog/TranslogCorruptedException.java | 0 .../translog/TranslogDeletionPolicy.java | 0 .../index/translog/TranslogException.java | 0 .../index/translog/TranslogReader.java | 0 .../index/translog/TranslogSnapshot.java | 0 .../index/translog/TranslogStats.java | 0 .../index/translog/TranslogToolCli.java | 0 .../index/translog/TranslogWriter.java | 0 .../translog/TruncateTranslogCommand.java | 0 .../translog/TruncatedTranslogException.java | 0 .../index/warmer/ShardIndexWarmerService.java | 0 .../index/warmer/WarmerStats.java | 0 .../AbstractIndexShardCacheEntity.java | 0 .../indices/AliasFilterParsingException.java | 0 .../indices/IndexClosedException.java | 0 .../indices/IndexCreationException.java | 0 ...ndexPrimaryShardNotAllocatedException.java | 0 .../IndexTemplateMissingException.java | 0 .../indices/IndexingMemoryController.java | 0 .../elasticsearch/indices/IndicesModule.java | 0 .../indices/IndicesQueryCache.java | 0 .../indices/IndicesRequestCache.java | 0 .../elasticsearch/indices/IndicesService.java | 0 .../indices/InvalidAliasNameException.java | 0 .../indices/InvalidIndexNameException.java | 0 .../InvalidIndexTemplateException.java | 0 .../indices/InvalidTypeNameException.java | 0 .../indices/NodeIndicesStats.java | 0 .../elasticsearch/indices/TermsLookup.java | 0 .../indices/TypeMissingException.java | 0 .../indices/analysis/AnalysisModule.java | 0 .../indices/analysis/HunspellService.java | 0 .../indices/analysis/PreBuiltAnalyzers.java | 0 .../analysis/PreBuiltCacheFactory.java | 0 .../indices/analysis/PreBuiltTokenizers.java | 0 .../breaker/AllCircuitBreakerStats.java | 0 .../indices/breaker/BreakerSettings.java | 0 .../breaker/CircuitBreakerService.java | 0 .../indices/breaker/CircuitBreakerStats.java | 0 .../HierarchyCircuitBreakerService.java | 0 .../breaker/NoneCircuitBreakerService.java | 0 .../cluster/IndicesClusterStateService.java | 0 .../cache/IndicesFieldDataCache.java | 0 .../cache/IndicesFieldDataCacheListener.java | 0 .../flush/ShardsSyncedFlushResult.java | 0 .../indices/flush/SyncedFlushService.java | 0 .../indices/mapper/MapperRegistry.java | 0 .../recovery/DelayRecoveryException.java | 0 .../recovery/PeerRecoverySourceService.java | 0 .../recovery/PeerRecoveryTargetService.java | 0 .../RecoverFilesRecoveryException.java | 0 .../recovery/RecoveriesCollection.java | 0 .../recovery/RecoveryCleanFilesRequest.java | 0 .../recovery/RecoveryFailedException.java | 0 .../recovery/RecoveryFileChunkRequest.java | 0 .../recovery/RecoveryFilesInfoRequest.java | 0 .../RecoveryFinalizeRecoveryRequest.java | 0 .../RecoveryHandoffPrimaryContextRequest.java | 0 ...ryPrepareForTranslogOperationsRequest.java | 0 .../indices/recovery/RecoveryResponse.java | 0 .../indices/recovery/RecoverySettings.java | 0 .../recovery/RecoverySourceHandler.java | 0 .../indices/recovery/RecoveryState.java | 0 .../indices/recovery/RecoveryTarget.java | 0 .../recovery/RecoveryTargetHandler.java | 0 .../RecoveryTranslogOperationsRequest.java | 0 .../RecoveryTranslogOperationsResponse.java | 0 .../RecoveryWaitForClusterStateRequest.java | 0 .../recovery/RemoteRecoveryTargetHandler.java | 0 .../recovery/StartRecoveryRequest.java | 0 .../indices/store/IndicesStore.java | 0 .../TransportNodesListShardStoreMetaData.java | 0 .../ingest/AbstractProcessor.java | 0 .../ingest/CompoundProcessor.java | 0 .../ingest/ConfigurationUtils.java | 0 .../elasticsearch/ingest/IngestDocument.java | 0 .../org/elasticsearch/ingest/IngestInfo.java | 0 .../elasticsearch/ingest/IngestMetadata.java | 0 .../elasticsearch/ingest/IngestService.java | 0 .../org/elasticsearch/ingest/IngestStats.java | 0 .../org/elasticsearch/ingest/Pipeline.java | 0 .../ingest/PipelineConfiguration.java | 0 .../ingest/PipelineExecutionService.java | 0 .../elasticsearch/ingest/PipelineStore.java | 0 .../org/elasticsearch/ingest/Processor.java | 0 .../elasticsearch/ingest/ProcessorInfo.java | 0 .../org/elasticsearch/ingest/ValueSource.java | 0 .../elasticsearch/monitor/MonitorService.java | 0 .../org/elasticsearch/monitor/Probes.java | 0 .../org/elasticsearch/monitor/fs/FsInfo.java | 0 .../org/elasticsearch/monitor/fs/FsProbe.java | 0 .../elasticsearch/monitor/fs/FsService.java | 0 .../monitor/jvm/DeadlockAnalyzer.java | 0 .../elasticsearch/monitor/jvm/GcNames.java | 0 .../elasticsearch/monitor/jvm/HotThreads.java | 0 .../monitor/jvm/JvmGcMonitorService.java | 0 .../elasticsearch/monitor/jvm/JvmInfo.java | 0 .../elasticsearch/monitor/jvm/JvmService.java | 0 .../elasticsearch/monitor/jvm/JvmStats.java | 0 .../elasticsearch/monitor/os/DummyOsInfo.java | 0 .../org/elasticsearch/monitor/os/OsInfo.java | 0 .../org/elasticsearch/monitor/os/OsProbe.java | 0 .../elasticsearch/monitor/os/OsService.java | 0 .../org/elasticsearch/monitor/os/OsStats.java | 0 .../elasticsearch/monitor/package-info.java | 0 .../monitor/process/ProcessInfo.java | 0 .../monitor/process/ProcessProbe.java | 0 .../monitor/process/ProcessService.java | 0 .../monitor/process/ProcessStats.java | 0 .../node/AdaptiveSelectionStats.java | 0 .../node/InternalSettingsPreparer.java | 0 .../java/org/elasticsearch/node/Node.java | 0 .../node/NodeClosedException.java | 0 .../org/elasticsearch/node/NodeService.java | 0 .../node/NodeValidationException.java | 0 .../node/ResponseCollectorService.java | 0 .../org/elasticsearch/node/package-info.java | 0 .../java/org/elasticsearch/package-info.java | 0 .../elasticsearch/plugins/ActionPlugin.java | 0 .../elasticsearch/plugins/AnalysisPlugin.java | 0 .../elasticsearch/plugins/ClusterPlugin.java | 0 .../plugins/DiscoveryPlugin.java | 0 .../plugins/ExtensiblePlugin.java | 0 .../elasticsearch/plugins/IngestPlugin.java | 0 .../elasticsearch/plugins/MapperPlugin.java | 0 .../plugins/MetaDataUpgrader.java | 0 .../elasticsearch/plugins/MetaPluginInfo.java | 0 .../elasticsearch/plugins/NetworkPlugin.java | 0 .../org/elasticsearch/plugins/Platforms.java | 0 .../org/elasticsearch/plugins/Plugin.java | 0 .../org/elasticsearch/plugins/PluginInfo.java | 0 .../plugins/PluginLoaderIndirection.java | 0 .../elasticsearch/plugins/PluginSecurity.java | 0 .../elasticsearch/plugins/PluginsService.java | 0 .../plugins/RepositoryPlugin.java | 0 .../elasticsearch/plugins/ScriptPlugin.java | 0 .../elasticsearch/plugins/SearchPlugin.java | 0 .../elasticsearch/plugins/package-info.java | 0 .../plugins/spi/NamedXContentProvider.java | 0 .../plugins/spi/package-info.java | 0 .../elasticsearch/repositories/IndexId.java | 0 .../repositories/RepositoriesModule.java | 0 .../repositories/RepositoriesService.java | 0 .../repositories/Repository.java | 0 .../repositories/RepositoryData.java | 0 .../repositories/RepositoryException.java | 0 .../RepositoryMissingException.java | 0 .../RepositoryVerificationException.java | 0 .../repositories/VerificationFailure.java | 0 .../VerifyNodeRepositoryAction.java | 0 .../blobstore/BlobStoreFormat.java | 0 .../blobstore/BlobStoreRepository.java | 0 .../blobstore/ChecksumBlobStoreFormat.java | 0 .../repositories/fs/FsRepository.java | 0 .../repositories/package-info.java | 0 .../rest/AbstractRestChannel.java | 0 .../elasticsearch/rest/BaseRestHandler.java | 0 .../elasticsearch/rest/BytesRestResponse.java | 0 .../rest/DeprecationRestHandler.java | 0 .../elasticsearch/rest/MethodHandlers.java | 0 .../org/elasticsearch/rest/RestChannel.java | 0 .../elasticsearch/rest/RestController.java | 0 .../org/elasticsearch/rest/RestHandler.java | 0 .../org/elasticsearch/rest/RestRequest.java | 0 .../org/elasticsearch/rest/RestResponse.java | 0 .../org/elasticsearch/rest/RestStatus.java | 0 .../org/elasticsearch/rest/RestUtils.java | 0 .../rest/action/AcknowledgedRestListener.java | 0 .../rest/action/RestActionListener.java | 0 .../rest/action/RestActions.java | 0 .../rest/action/RestBuilderListener.java | 0 .../action/RestFieldCapabilitiesAction.java | 0 .../rest/action/RestMainAction.java | 0 .../rest/action/RestResponseListener.java | 0 .../action/RestStatusToXContentListener.java | 0 .../rest/action/RestToXContentListener.java | 0 .../admin/cluster/RestCancelTasksAction.java | 0 .../RestClusterAllocationExplainAction.java | 0 .../cluster/RestClusterGetSettingsAction.java | 0 .../cluster/RestClusterHealthAction.java | 0 .../cluster/RestClusterRerouteAction.java | 0 .../RestClusterSearchShardsAction.java | 0 .../admin/cluster/RestClusterStateAction.java | 0 .../admin/cluster/RestClusterStatsAction.java | 0 .../RestClusterUpdateSettingsAction.java | 0 .../cluster/RestCreateSnapshotAction.java | 0 .../cluster/RestDeleteRepositoryAction.java | 0 .../cluster/RestDeleteSnapshotAction.java | 0 .../cluster/RestDeleteStoredScriptAction.java | 0 .../cluster/RestGetRepositoriesAction.java | 0 .../admin/cluster/RestGetSnapshotsAction.java | 0 .../cluster/RestGetStoredScriptAction.java | 0 .../admin/cluster/RestGetTaskAction.java | 0 .../admin/cluster/RestListTasksAction.java | 0 .../cluster/RestNodesHotThreadsAction.java | 0 .../admin/cluster/RestNodesInfoAction.java | 0 .../admin/cluster/RestNodesStatsAction.java | 0 .../admin/cluster/RestNodesUsageAction.java | 0 .../RestPendingClusterTasksAction.java | 0 .../cluster/RestPutRepositoryAction.java | 0 .../cluster/RestPutStoredScriptAction.java | 0 .../cluster/RestRemoteClusterInfoAction.java | 0 .../cluster/RestRestoreSnapshotAction.java | 0 .../cluster/RestSnapshotsStatusAction.java | 0 .../cluster/RestVerifyRepositoryAction.java | 0 .../action/admin/cluster/package-info.java | 0 .../indices/AliasesNotFoundException.java | 0 .../admin/indices/RestAnalyzeAction.java | 0 .../indices/RestClearIndicesCacheAction.java | 0 .../admin/indices/RestCloseIndexAction.java | 0 .../admin/indices/RestCreateIndexAction.java | 0 .../admin/indices/RestDeleteIndexAction.java | 0 .../RestDeleteIndexTemplateAction.java | 0 .../action/admin/indices/RestFlushAction.java | 0 .../admin/indices/RestForceMergeAction.java | 0 .../admin/indices/RestGetAliasesAction.java | 0 .../indices/RestGetAllAliasesAction.java | 0 .../indices/RestGetAllMappingsAction.java | 0 .../indices/RestGetAllSettingsAction.java | 0 .../indices/RestGetFieldMappingAction.java | 0 .../indices/RestGetIndexTemplateAction.java | 0 .../admin/indices/RestGetIndicesAction.java | 0 .../admin/indices/RestGetMappingAction.java | 0 .../admin/indices/RestGetSettingsAction.java | 0 .../indices/RestIndexDeleteAliasesAction.java | 0 .../indices/RestIndexPutAliasAction.java | 0 .../indices/RestIndicesAliasesAction.java | 0 .../indices/RestIndicesSegmentsAction.java | 0 .../indices/RestIndicesShardStoresAction.java | 0 .../admin/indices/RestIndicesStatsAction.java | 0 .../admin/indices/RestOpenIndexAction.java | 0 .../indices/RestPutIndexTemplateAction.java | 0 .../admin/indices/RestPutMappingAction.java | 0 .../admin/indices/RestRecoveryAction.java | 0 .../admin/indices/RestRefreshAction.java | 0 .../indices/RestRolloverIndexAction.java | 0 .../admin/indices/RestShrinkIndexAction.java | 0 .../admin/indices/RestSplitIndexAction.java | 0 .../admin/indices/RestSyncedFlushAction.java | 0 .../indices/RestUpdateSettingsAction.java | 0 .../admin/indices/RestUpgradeAction.java | 0 .../indices/RestValidateQueryAction.java | 0 .../action/admin/indices/package-info.java | 0 .../rest/action/cat/AbstractCatAction.java | 0 .../rest/action/cat/RestAliasAction.java | 0 .../rest/action/cat/RestAllocationAction.java | 0 .../rest/action/cat/RestCatAction.java | 0 .../rest/action/cat/RestCountAction.java | 0 .../rest/action/cat/RestFielddataAction.java | 0 .../rest/action/cat/RestHealthAction.java | 0 .../rest/action/cat/RestIndicesAction.java | 0 .../rest/action/cat/RestMasterAction.java | 0 .../rest/action/cat/RestNodeAttrsAction.java | 0 .../rest/action/cat/RestNodesAction.java | 0 .../cat/RestPendingClusterTasksAction.java | 0 .../rest/action/cat/RestPluginsAction.java | 0 .../rest/action/cat/RestRecoveryAction.java | 0 .../action/cat/RestRepositoriesAction.java | 0 .../rest/action/cat/RestSegmentsAction.java | 0 .../rest/action/cat/RestShardsAction.java | 0 .../rest/action/cat/RestSnapshotAction.java | 0 .../rest/action/cat/RestTable.java | 0 .../rest/action/cat/RestTasksAction.java | 0 .../rest/action/cat/RestTemplatesAction.java | 0 .../rest/action/cat/RestThreadPoolAction.java | 0 .../rest/action/cat/package-info.java | 0 .../rest/action/document/RestBulkAction.java | 0 .../rest/action/document/RestCountAction.java | 0 .../action/document/RestDeleteAction.java | 0 .../rest/action/document/RestGetAction.java | 0 .../action/document/RestGetSourceAction.java | 0 .../rest/action/document/RestIndexAction.java | 0 .../action/document/RestMultiGetAction.java | 0 .../document/RestMultiTermVectorsAction.java | 0 .../document/RestTermVectorsAction.java | 0 .../action/document/RestUpdateAction.java | 0 .../rest/action/document/package-info.java | 0 .../ingest/RestDeletePipelineAction.java | 0 .../action/ingest/RestGetPipelineAction.java | 0 .../action/ingest/RestPutPipelineAction.java | 0 .../ingest/RestSimulatePipelineAction.java | 0 .../rest/action/ingest/package-info.java | 0 .../rest/action/package-info.java | 0 .../action/search/RestClearScrollAction.java | 0 .../rest/action/search/RestExplainAction.java | 0 .../action/search/RestMultiSearchAction.java | 0 .../rest/action/search/RestSearchAction.java | 0 .../action/search/RestSearchScrollAction.java | 0 .../rest/action/search/package-info.java | 0 .../org/elasticsearch/rest/package-info.java | 0 .../elasticsearch/script/ClassPermission.java | 0 .../script/ExecutableScript.java | 0 .../script/ExplainableSearchScript.java | 0 .../elasticsearch/script/FilterScript.java | 0 .../script/GeneralScriptException.java | 0 .../elasticsearch/script/ScoreAccessor.java | 0 .../java/org/elasticsearch/script/Script.java | 0 .../elasticsearch/script/ScriptContext.java | 0 .../elasticsearch/script/ScriptEngine.java | 0 .../elasticsearch/script/ScriptException.java | 0 .../elasticsearch/script/ScriptMetaData.java | 0 .../elasticsearch/script/ScriptMetrics.java | 0 .../elasticsearch/script/ScriptModule.java | 0 .../elasticsearch/script/ScriptService.java | 0 .../org/elasticsearch/script/ScriptStats.java | 0 .../org/elasticsearch/script/ScriptType.java | 0 .../elasticsearch/script/SearchScript.java | 0 .../script/SimilarityScript.java | 0 .../script/SimilarityWeightScript.java | 0 .../script/StoredScriptSource.java | 0 .../elasticsearch/script/TemplateScript.java | 0 .../elasticsearch/script/package-info.java | 0 .../search/DefaultSearchContext.java | 0 .../elasticsearch/search/DocValueFormat.java | 0 .../elasticsearch/search/MultiValueMode.java | 0 .../java/org/elasticsearch/search/Scroll.java | 0 .../search/SearchContextException.java | 0 .../search/SearchContextMissingException.java | 0 .../elasticsearch/search/SearchException.java | 0 .../search/SearchExtBuilder.java | 0 .../org/elasticsearch/search/SearchHit.java | 0 .../org/elasticsearch/search/SearchHits.java | 0 .../elasticsearch/search/SearchModule.java | 0 .../search/SearchParseException.java | 0 .../org/elasticsearch/search/SearchPhase.java | 0 .../search/SearchPhaseResult.java | 0 .../elasticsearch/search/SearchService.java | 0 .../search/SearchShardTarget.java | 0 .../search/SearchSortValues.java | 0 .../AbstractAggregationBuilder.java | 0 .../search/aggregations/Aggregation.java | 0 .../aggregations/AggregationBuilder.java | 0 .../aggregations/AggregationBuilders.java | 0 .../AggregationExecutionException.java | 0 .../AggregationInitializationException.java | 0 .../search/aggregations/AggregationPhase.java | 0 .../search/aggregations/Aggregations.java | 0 .../search/aggregations/Aggregator.java | 0 .../search/aggregations/AggregatorBase.java | 0 .../aggregations/AggregatorFactories.java | 0 .../aggregations/AggregatorFactory.java | 0 .../aggregations/BaseAggregationBuilder.java | 0 .../search/aggregations/BucketCollector.java | 0 .../search/aggregations/BucketOrder.java | 0 .../search/aggregations/HasAggregations.java | 0 .../aggregations/InternalAggregation.java | 0 .../aggregations/InternalAggregations.java | 0 .../InternalMultiBucketAggregation.java | 0 .../search/aggregations/InternalOrder.java | 0 .../InvalidAggregationPathException.java | 0 .../search/aggregations/KeyComparable.java | 0 .../aggregations/LeafBucketCollector.java | 0 .../aggregations/LeafBucketCollectorBase.java | 0 .../MultiBucketConsumerService.java | 0 .../aggregations/NonCollectingAggregator.java | 0 .../aggregations/ParsedAggregation.java | 0 .../ParsedMultiBucketAggregation.java | 0 .../PipelineAggregationBuilder.java | 0 .../SearchContextAggregations.java | 0 .../bucket/BestBucketsDeferringCollector.java | 0 .../aggregations/bucket/BucketUtils.java | 0 .../bucket/BucketsAggregator.java | 0 .../bucket/DeferableBucketAggregator.java | 0 .../bucket/DeferringBucketCollector.java | 0 .../InternalSingleBucketAggregation.java | 0 .../bucket/MultiBucketAggregationBuilder.java | 0 .../bucket/MultiBucketsAggregation.java | 0 .../bucket/ParsedSingleBucketAggregation.java | 0 .../bucket/SingleBucketAggregation.java | 0 .../bucket/SingleBucketAggregator.java | 0 .../bucket/adjacency/AdjacencyMatrix.java | 0 .../AdjacencyMatrixAggregationBuilder.java | 0 .../adjacency/AdjacencyMatrixAggregator.java | 0 .../AdjacencyMatrixAggregatorFactory.java | 0 .../adjacency/InternalAdjacencyMatrix.java | 0 .../adjacency/ParsedAdjacencyMatrix.java | 0 .../composite/CompositeAggregation.java | 0 .../CompositeAggregationBuilder.java | 0 .../CompositeAggregationFactory.java | 0 .../composite/CompositeAggregationPlugin.java | 0 .../bucket/composite/CompositeAggregator.java | 0 .../bucket/composite/CompositeKey.java | 0 .../composite/CompositeValuesComparator.java | 0 .../composite/CompositeValuesSource.java | 0 .../CompositeValuesSourceBuilder.java | 0 .../CompositeValuesSourceConfig.java | 0 .../CompositeValuesSourceParserHelper.java | 0 .../DateHistogramValuesSourceBuilder.java | 0 .../composite/HistogramValuesSource.java | 0 .../HistogramValuesSourceBuilder.java | 0 .../bucket/composite/InternalComposite.java | 0 .../bucket/composite/ParsedComposite.java | 0 .../composite/RoundingValuesSource.java | 0 .../composite/TermsValuesSourceBuilder.java | 0 .../aggregations/bucket/filter/Filter.java | 0 .../filter/FilterAggregationBuilder.java | 0 .../bucket/filter/FilterAggregator.java | 0 .../filter/FilterAggregatorFactory.java | 0 .../aggregations/bucket/filter/Filters.java | 0 .../filter/FiltersAggregationBuilder.java | 0 .../bucket/filter/FiltersAggregator.java | 0 .../filter/FiltersAggregatorFactory.java | 0 .../bucket/filter/InternalFilter.java | 0 .../bucket/filter/InternalFilters.java | 0 .../bucket/filter/ParsedFilter.java | 0 .../bucket/filter/ParsedFilters.java | 0 .../geogrid/GeoGridAggregationBuilder.java | 0 .../bucket/geogrid/GeoHashGrid.java | 0 .../bucket/geogrid/GeoHashGridAggregator.java | 0 .../geogrid/GeoHashGridAggregatorFactory.java | 0 .../bucket/geogrid/GeoHashGridParams.java | 0 .../bucket/geogrid/InternalGeoHashGrid.java | 0 .../bucket/geogrid/ParsedGeoHashGrid.java | 0 .../aggregations/bucket/global/Global.java | 0 .../global/GlobalAggregationBuilder.java | 0 .../bucket/global/GlobalAggregator.java | 0 .../global/GlobalAggregatorFactory.java | 0 .../bucket/global/InternalGlobal.java | 0 .../bucket/global/ParsedGlobal.java | 0 .../DateHistogramAggregationBuilder.java | 0 .../histogram/DateHistogramAggregator.java | 0 .../DateHistogramAggregatorFactory.java | 0 .../histogram/DateHistogramInterval.java | 0 .../bucket/histogram/ExtendedBounds.java | 0 .../bucket/histogram/Histogram.java | 0 .../HistogramAggregationBuilder.java | 0 .../bucket/histogram/HistogramAggregator.java | 0 .../histogram/HistogramAggregatorFactory.java | 0 .../bucket/histogram/HistogramFactory.java | 0 .../histogram/InternalDateHistogram.java | 0 .../bucket/histogram/InternalHistogram.java | 0 .../bucket/histogram/ParsedDateHistogram.java | 0 .../bucket/histogram/ParsedHistogram.java | 0 .../bucket/missing/InternalMissing.java | 0 .../aggregations/bucket/missing/Missing.java | 0 .../missing/MissingAggregationBuilder.java | 0 .../bucket/missing/MissingAggregator.java | 0 .../missing/MissingAggregatorFactory.java | 0 .../bucket/missing/ParsedMissing.java | 0 .../bucket/nested/InternalNested.java | 0 .../bucket/nested/InternalReverseNested.java | 0 .../aggregations/bucket/nested/Nested.java | 0 .../nested/NestedAggregationBuilder.java | 0 .../bucket/nested/NestedAggregator.java | 0 .../nested/NestedAggregatorFactory.java | 0 .../bucket/nested/ParsedNested.java | 0 .../bucket/nested/ParsedReverseNested.java | 0 .../bucket/nested/ReverseNested.java | 0 .../ReverseNestedAggregationBuilder.java | 0 .../nested/ReverseNestedAggregator.java | 0 .../ReverseNestedAggregatorFactory.java | 0 .../search/aggregations/bucket/package-info | 0 .../range/AbstractRangeAggregatorFactory.java | 0 .../bucket/range/AbstractRangeBuilder.java | 0 .../bucket/range/BinaryRangeAggregator.java | 0 .../range/BinaryRangeAggregatorFactory.java | 0 .../range/DateRangeAggregationBuilder.java | 0 .../range/DateRangeAggregatorFactory.java | 0 .../range/GeoDistanceAggregationBuilder.java | 0 .../GeoDistanceRangeAggregatorFactory.java | 0 .../bucket/range/InternalBinaryRange.java | 0 .../bucket/range/InternalDateRange.java | 0 .../bucket/range/InternalGeoDistance.java | 0 .../bucket/range/InternalRange.java | 0 .../range/IpRangeAggregationBuilder.java | 0 .../bucket/range/ParsedBinaryRange.java | 0 .../bucket/range/ParsedDateRange.java | 0 .../bucket/range/ParsedGeoDistance.java | 0 .../bucket/range/ParsedRange.java | 0 .../aggregations/bucket/range/Range.java | 0 .../bucket/range/RangeAggregationBuilder.java | 0 .../bucket/range/RangeAggregator.java | 0 .../bucket/range/RangeAggregatorFactory.java | 0 .../sampler/BestDocsDeferringCollector.java | 0 .../DiversifiedAggregationBuilder.java | 0 .../sampler/DiversifiedAggregatorFactory.java | 0 ...DiversifiedBytesHashSamplerAggregator.java | 0 .../DiversifiedMapSamplerAggregator.java | 0 .../DiversifiedNumericSamplerAggregator.java | 0 .../DiversifiedOrdinalsSamplerAggregator.java | 0 .../bucket/sampler/InternalSampler.java | 0 .../bucket/sampler/ParsedSampler.java | 0 .../aggregations/bucket/sampler/Sampler.java | 0 .../sampler/SamplerAggregationBuilder.java | 0 .../bucket/sampler/SamplerAggregator.java | 0 .../sampler/SamplerAggregatorFactory.java | 0 .../bucket/sampler/UnmappedSampler.java | 0 .../BucketSignificancePriorityQueue.java | 0 ...balOrdinalsSignificantTermsAggregator.java | 0 .../InternalMappedSignificantTerms.java | 0 .../significant/InternalSignificantTerms.java | 0 .../ParsedSignificantLongTerms.java | 0 .../ParsedSignificantStringTerms.java | 0 .../significant/ParsedSignificantTerms.java | 0 .../significant/SignificantLongTerms.java | 0 .../SignificantLongTermsAggregator.java | 0 .../significant/SignificantStringTerms.java | 0 .../SignificantStringTermsAggregator.java | 0 .../bucket/significant/SignificantTerms.java | 0 .../SignificantTermsAggregationBuilder.java | 0 .../SignificantTermsAggregatorFactory.java | 0 .../SignificantTextAggregationBuilder.java | 0 .../SignificantTextAggregator.java | 0 .../SignificantTextAggregatorFactory.java | 0 .../significant/UnmappedSignificantTerms.java | 0 .../significant/heuristics/ChiSquare.java | 0 .../bucket/significant/heuristics/GND.java | 0 .../significant/heuristics/JLHScore.java | 0 .../heuristics/MutualInformation.java | 0 .../heuristics/NXYSignificanceHeuristic.java | 0 .../heuristics/PercentageScore.java | 0 .../heuristics/ScriptHeuristic.java | 0 .../heuristics/SignificanceHeuristic.java | 0 .../SignificanceHeuristicBuilder.java | 0 .../SignificanceHeuristicParser.java | 0 .../terms/AbstractStringTermsAggregator.java | 0 .../bucket/terms/BucketPriorityQueue.java | 0 .../bucket/terms/DoubleTerms.java | 0 .../bucket/terms/DoubleTermsAggregator.java | 0 .../GlobalOrdinalsStringTermsAggregator.java | 0 .../bucket/terms/IncludeExclude.java | 0 .../bucket/terms/InternalMappedTerms.java | 0 .../bucket/terms/InternalTerms.java | 0 .../aggregations/bucket/terms/LongTerms.java | 0 .../bucket/terms/LongTermsAggregator.java | 0 .../bucket/terms/ParsedDoubleTerms.java | 0 .../bucket/terms/ParsedLongTerms.java | 0 .../bucket/terms/ParsedStringTerms.java | 0 .../bucket/terms/ParsedTerms.java | 0 .../bucket/terms/StringTerms.java | 0 .../bucket/terms/StringTermsAggregator.java | 0 .../aggregations/bucket/terms/Terms.java | 0 .../bucket/terms/TermsAggregationBuilder.java | 0 .../bucket/terms/TermsAggregator.java | 0 .../bucket/terms/TermsAggregatorFactory.java | 0 .../bucket/terms/UnmappedTerms.java | 0 .../InternalNumericMetricsAggregation.java | 0 .../metrics/MetricsAggregator.java | 0 .../metrics/NumericMetricsAggregation.java | 0 .../metrics/NumericMetricsAggregator.java | 0 ...dSingleValueNumericMetricsAggregation.java | 0 .../search/aggregations/metrics/avg/Avg.java | 0 .../metrics/avg/AvgAggregationBuilder.java | 0 .../metrics/avg/AvgAggregator.java | 0 .../metrics/avg/AvgAggregatorFactory.java | 0 .../aggregations/metrics/avg/InternalAvg.java | 0 .../aggregations/metrics/avg/ParsedAvg.java | 0 .../metrics/cardinality/Cardinality.java | 0 .../CardinalityAggregationBuilder.java | 0 .../cardinality/CardinalityAggregator.java | 0 .../CardinalityAggregatorFactory.java | 0 .../cardinality/HyperLogLogPlusPlus.java | 0 .../cardinality/InternalCardinality.java | 0 .../cardinality/ParsedCardinality.java | 0 .../metrics/geobounds/GeoBounds.java | 0 .../GeoBoundsAggregationBuilder.java | 0 .../geobounds/GeoBoundsAggregator.java | 0 .../geobounds/GeoBoundsAggregatorFactory.java | 0 .../metrics/geobounds/InternalGeoBounds.java | 0 .../metrics/geobounds/ParsedGeoBounds.java | 0 .../metrics/geocentroid/GeoCentroid.java | 0 .../GeoCentroidAggregationBuilder.java | 0 .../geocentroid/GeoCentroidAggregator.java | 0 .../GeoCentroidAggregatorFactory.java | 0 .../geocentroid/InternalGeoCentroid.java | 0 .../geocentroid/ParsedGeoCentroid.java | 0 .../aggregations/metrics/max/InternalMax.java | 0 .../search/aggregations/metrics/max/Max.java | 0 .../metrics/max/MaxAggregationBuilder.java | 0 .../metrics/max/MaxAggregator.java | 0 .../metrics/max/MaxAggregatorFactory.java | 0 .../aggregations/metrics/max/ParsedMax.java | 0 .../aggregations/metrics/min/InternalMin.java | 0 .../search/aggregations/metrics/min/Min.java | 0 .../metrics/min/MinAggregationBuilder.java | 0 .../metrics/min/MinAggregator.java | 0 .../metrics/min/MinAggregatorFactory.java | 0 .../aggregations/metrics/min/ParsedMin.java | 0 .../aggregations/metrics/package-info.java | 0 .../percentiles/ParsedPercentileRanks.java | 0 .../percentiles/ParsedPercentiles.java | 0 .../metrics/percentiles/Percentile.java | 0 .../metrics/percentiles/PercentileRanks.java | 0 .../PercentileRanksAggregationBuilder.java | 0 .../metrics/percentiles/Percentiles.java | 0 .../PercentilesAggregationBuilder.java | 0 .../percentiles/PercentilesMethod.java | 0 .../hdr/AbstractHDRPercentilesAggregator.java | 0 .../hdr/AbstractInternalHDRPercentiles.java | 0 .../hdr/HDRPercentileRanksAggregator.java | 0 .../HDRPercentileRanksAggregatorFactory.java | 0 .../hdr/HDRPercentilesAggregator.java | 0 .../hdr/HDRPercentilesAggregatorFactory.java | 0 .../hdr/InternalHDRPercentileRanks.java | 0 .../hdr/InternalHDRPercentiles.java | 0 .../hdr/ParsedHDRPercentileRanks.java | 0 .../percentiles/hdr/ParsedHDRPercentiles.java | 0 .../AbstractInternalTDigestPercentiles.java | 0 .../AbstractTDigestPercentilesAggregator.java | 0 .../InternalTDigestPercentileRanks.java | 0 .../tdigest/InternalTDigestPercentiles.java | 0 .../tdigest/ParsedTDigestPercentileRanks.java | 0 .../tdigest/ParsedTDigestPercentiles.java | 0 .../TDigestPercentileRanksAggregator.java | 0 ...igestPercentileRanksAggregatorFactory.java | 0 .../tdigest/TDigestPercentilesAggregator.java | 0 .../TDigestPercentilesAggregatorFactory.java | 0 .../percentiles/tdigest/TDigestState.java | 0 .../scripted/InternalScriptedMetric.java | 0 .../scripted/ParsedScriptedMetric.java | 0 .../metrics/scripted/ScriptedMetric.java | 0 .../ScriptedMetricAggregationBuilder.java | 0 .../scripted/ScriptedMetricAggregator.java | 0 .../ScriptedMetricAggregatorFactory.java | 0 .../metrics/stats/InternalStats.java | 0 .../metrics/stats/ParsedStats.java | 0 .../aggregations/metrics/stats/Stats.java | 0 .../stats/StatsAggregationBuilder.java | 0 .../metrics/stats/StatsAggregator.java | 0 .../metrics/stats/StatsAggregatorFactory.java | 0 .../metrics/stats/extended/ExtendedStats.java | 0 .../ExtendedStatsAggregationBuilder.java | 0 .../extended/ExtendedStatsAggregator.java | 0 .../ExtendedStatsAggregatorFactory.java | 0 .../stats/extended/InternalExtendedStats.java | 0 .../stats/extended/ParsedExtendedStats.java | 0 .../aggregations/metrics/sum/InternalSum.java | 0 .../aggregations/metrics/sum/ParsedSum.java | 0 .../search/aggregations/metrics/sum/Sum.java | 0 .../metrics/sum/SumAggregationBuilder.java | 0 .../metrics/sum/SumAggregator.java | 0 .../metrics/sum/SumAggregatorFactory.java | 0 .../metrics/tophits/InternalTopHits.java | 0 .../metrics/tophits/ParsedTopHits.java | 0 .../aggregations/metrics/tophits/TopHits.java | 0 .../tophits/TopHitsAggregationBuilder.java | 0 .../metrics/tophits/TopHitsAggregator.java | 0 .../tophits/TopHitsAggregatorFactory.java | 0 .../valuecount/InternalValueCount.java | 0 .../metrics/valuecount/ParsedValueCount.java | 0 .../metrics/valuecount/ValueCount.java | 0 .../ValueCountAggregationBuilder.java | 0 .../valuecount/ValueCountAggregator.java | 0 .../ValueCountAggregatorFactory.java | 0 .../search/aggregations/package-info.java | 0 .../AbstractPipelineAggregationBuilder.java | 0 .../aggregations/pipeline/BucketHelpers.java | 0 .../pipeline/InternalSimpleValue.java | 0 .../pipeline/ParsedSimpleValue.java | 0 .../pipeline/PipelineAggregator.java | 0 .../pipeline/PipelineAggregatorBuilders.java | 0 .../pipeline/SiblingPipelineAggregator.java | 0 .../aggregations/pipeline/SimpleValue.java | 0 .../bucketmetrics/BucketMetricValue.java | 0 .../bucketmetrics/BucketMetricsParser.java | 0 ...cketMetricsPipelineAggregationBuilder.java | 0 .../BucketMetricsPipelineAggregator.java | 0 .../InternalBucketMetricValue.java | 0 .../ParsedBucketMetricValue.java | 0 .../AvgBucketPipelineAggregationBuilder.java | 0 .../avg/AvgBucketPipelineAggregator.java | 0 .../MaxBucketPipelineAggregationBuilder.java | 0 .../max/MaxBucketPipelineAggregator.java | 0 .../MinBucketPipelineAggregationBuilder.java | 0 .../min/MinBucketPipelineAggregator.java | 0 .../percentile/InternalPercentilesBucket.java | 0 .../percentile/ParsedPercentilesBucket.java | 0 .../percentile/PercentilesBucket.java | 0 ...tilesBucketPipelineAggregationBuilder.java | 0 .../PercentilesBucketPipelineAggregator.java | 0 .../stats/InternalStatsBucket.java | 0 .../stats/ParsedStatsBucket.java | 0 .../bucketmetrics/stats/StatsBucket.java | 0 ...StatsBucketPipelineAggregationBuilder.java | 0 .../stats/StatsBucketPipelineAggregator.java | 0 .../stats/extended/ExtendedStatsBucket.java | 0 .../extended/ExtendedStatsBucketParser.java | 0 ...StatsBucketPipelineAggregationBuilder.java | 0 ...ExtendedStatsBucketPipelineAggregator.java | 0 .../extended/InternalExtendedStatsBucket.java | 0 .../extended/ParsedExtendedStatsBucket.java | 0 .../SumBucketPipelineAggregationBuilder.java | 0 .../sum/SumBucketPipelineAggregator.java | 0 ...ucketScriptPipelineAggregationBuilder.java | 0 .../BucketScriptPipelineAggregator.java | 0 ...ketSelectorPipelineAggregationBuilder.java | 0 .../BucketSelectorPipelineAggregator.java | 0 .../BucketSortPipelineAggregationBuilder.java | 0 .../BucketSortPipelineAggregator.java | 0 ...mulativeSumPipelineAggregationBuilder.java | 0 .../CumulativeSumPipelineAggregator.java | 0 .../pipeline/derivative/Derivative.java | 0 .../DerivativePipelineAggregationBuilder.java | 0 .../DerivativePipelineAggregator.java | 0 .../derivative/InternalDerivative.java | 0 .../pipeline/derivative/ParsedDerivative.java | 0 .../MovAvgPipelineAggregationBuilder.java | 0 .../movavg/MovAvgPipelineAggregator.java | 0 .../movavg/SimulatedAnealingMinimizer.java | 0 .../pipeline/movavg/models/EwmaModel.java | 0 .../movavg/models/HoltLinearModel.java | 0 .../movavg/models/HoltWintersModel.java | 0 .../pipeline/movavg/models/LinearModel.java | 0 .../pipeline/movavg/models/MovAvgModel.java | 0 .../movavg/models/MovAvgModelBuilder.java | 0 .../pipeline/movavg/models/SimpleModel.java | 0 .../SerialDiffPipelineAggregationBuilder.java | 0 .../SerialDiffPipelineAggregator.java | 0 .../aggregations/support/AggregationPath.java | 0 .../aggregations/support/FieldContext.java | 0 .../aggregations/support/MissingValues.java | 0 .../aggregations/support/ValueType.java | 0 .../aggregations/support/ValuesSource.java | 0 .../ValuesSourceAggregationBuilder.java | 0 .../ValuesSourceAggregatorFactory.java | 0 .../support/ValuesSourceConfig.java | 0 .../support/ValuesSourceParserHelper.java | 0 .../support/ValuesSourceType.java | 0 .../support/values/ScriptBytesValues.java | 0 .../support/values/ScriptDoubleValues.java | 0 .../support/values/ScriptLongValues.java | 0 .../search/builder/SearchSourceBuilder.java | 0 .../builder/SearchSourceBuilderException.java | 0 .../search/collapse/CollapseBuilder.java | 0 .../search/collapse/CollapseContext.java | 0 .../search/dfs/AggregatedDfs.java | 0 .../elasticsearch/search/dfs/DfsPhase.java | 0 .../dfs/DfsPhaseExecutionException.java | 0 .../search/dfs/DfsSearchResult.java | 0 .../search/fetch/FetchPhase.java | 0 .../fetch/FetchPhaseExecutionException.java | 0 .../search/fetch/FetchSearchResult.java | 0 .../search/fetch/FetchSubPhase.java | 0 .../search/fetch/QueryFetchSearchResult.java | 0 .../fetch/ScrollQueryFetchSearchResult.java | 0 .../search/fetch/ShardFetchRequest.java | 0 .../search/fetch/ShardFetchSearchRequest.java | 0 .../search/fetch/StoredFieldsContext.java | 0 .../search/fetch/package-info.java | 0 .../fetch/subphase/DocValueFieldsContext.java | 0 .../subphase/DocValueFieldsFetchSubPhase.java | 0 .../fetch/subphase/ExplainFetchSubPhase.java | 0 .../fetch/subphase/FetchSourceContext.java | 0 .../fetch/subphase/FetchSourceSubPhase.java | 0 .../fetch/subphase/InnerHitsContext.java | 0 .../subphase/InnerHitsFetchSubPhase.java | 0 .../subphase/MatchedQueriesFetchSubPhase.java | 0 .../subphase/ParentFieldSubFetchPhase.java | 0 .../fetch/subphase/ScriptFieldsContext.java | 0 .../subphase/ScriptFieldsFetchSubPhase.java | 0 .../fetch/subphase/VersionFetchSubPhase.java | 0 .../highlight/AbstractHighlighterBuilder.java | 0 .../subphase/highlight/CustomQueryScorer.java | 0 .../highlight/FastVectorHighlighter.java | 0 .../highlight/FragmentBuilderHelper.java | 0 .../subphase/highlight/HighlightBuilder.java | 0 .../subphase/highlight/HighlightField.java | 0 .../subphase/highlight/HighlightPhase.java | 0 .../subphase/highlight/HighlightUtils.java | 0 .../fetch/subphase/highlight/Highlighter.java | 0 .../highlight/HighlighterContext.java | 0 .../subphase/highlight/PlainHighlighter.java | 0 .../highlight/SearchContextHighlight.java | 0 .../highlight/SimpleFragmentsBuilder.java | 0 .../SourceScoreOrderFragmentsBuilder.java | 0 .../SourceSimpleFragmentsBuilder.java | 0 .../highlight/UnifiedHighlighter.java | 0 .../subphase/highlight/package-info.java | 0 .../search/fetch/subphase/package-info.java | 0 .../search/internal/AliasFilter.java | 0 .../internal/CancellableBulkScorer.java | 0 .../search/internal/ContextIndexSearcher.java | 0 .../internal/FilteredSearchContext.java | 0 .../internal/InternalScrollSearchRequest.java | 0 .../internal/InternalSearchResponse.java | 0 .../search/internal/ScrollContext.java | 0 .../search/internal/SearchContext.java | 0 .../internal/ShardSearchLocalRequest.java | 0 .../search/internal/ShardSearchRequest.java | 0 .../internal/ShardSearchTransportRequest.java | 0 .../search/internal/SubSearchContext.java | 0 .../search/lookup/DocLookup.java | 0 .../search/lookup/FieldLookup.java | 0 .../search/lookup/FieldsLookup.java | 0 .../search/lookup/LeafDocLookup.java | 0 .../search/lookup/LeafFieldsLookup.java | 0 .../search/lookup/LeafSearchLookup.java | 0 .../search/lookup/SearchLookup.java | 0 .../search/lookup/SourceLookup.java | 0 .../profile/AbstractInternalProfileTree.java | 0 .../profile/AbstractProfileBreakdown.java | 0 .../search/profile/AbstractProfiler.java | 0 .../search/profile/ProfileResult.java | 0 .../search/profile/ProfileShardResult.java | 0 .../search/profile/Profilers.java | 0 .../profile/SearchProfileShardResults.java | 0 .../elasticsearch/search/profile/Timer.java | 0 .../AggregationProfileBreakdown.java | 0 .../AggregationProfileShardResult.java | 0 .../aggregation/AggregationProfiler.java | 0 .../aggregation/AggregationTimingType.java | 0 .../InternalAggregationProfileTree.java | 0 .../aggregation/ProfilingAggregator.java | 0 .../ProfilingLeafBucketCollector.java | 0 .../profile/aggregation/package-info.java | 0 .../search/profile/package-info.java | 0 .../search/profile/query/CollectorResult.java | 0 .../query/InternalProfileCollector.java | 0 .../query/InternalQueryProfileTree.java | 0 .../profile/query/ProfileCollector.java | 0 .../search/profile/query/ProfileScorer.java | 0 .../search/profile/query/ProfileWeight.java | 0 .../profile/query/QueryProfileBreakdown.java | 0 .../query/QueryProfileShardResult.java | 0 .../search/profile/query/QueryProfiler.java | 0 .../search/profile/query/QueryTimingType.java | 0 .../search/profile/query/package-info.java | 0 .../search/query/CancellableCollector.java | 0 .../query/EarlyTerminatingCollector.java | 0 .../search/query/QueryCollectorContext.java | 0 .../search/query/QueryPhase.java | 0 .../query/QueryPhaseExecutionException.java | 0 .../search/query/QuerySearchRequest.java | 0 .../search/query/QuerySearchResult.java | 0 .../search/query/ScrollQuerySearchResult.java | 0 .../search/query/TopDocsCollectorContext.java | 0 .../search/rescore/QueryRescoreMode.java | 0 .../search/rescore/QueryRescorer.java | 0 .../search/rescore/QueryRescorerBuilder.java | 0 .../search/rescore/RescoreContext.java | 0 .../search/rescore/RescorePhase.java | 0 .../search/rescore/Rescorer.java | 0 .../search/rescore/RescorerBuilder.java | 0 .../searchafter/SearchAfterBuilder.java | 0 .../search/slice/DocValuesSliceQuery.java | 0 .../search/slice/SliceBuilder.java | 0 .../search/slice/SliceQuery.java | 0 .../search/slice/TermsSliceQuery.java | 0 .../search/sort/FieldSortBuilder.java | 0 .../search/sort/GeoDistanceSortBuilder.java | 0 .../search/sort/NestedSortBuilder.java | 0 .../search/sort/ScoreSortBuilder.java | 0 .../search/sort/ScriptSortBuilder.java | 0 .../search/sort/SortAndFormats.java | 0 .../search/sort/SortBuilder.java | 0 .../search/sort/SortBuilders.java | 0 .../search/sort/SortFieldAndFormat.java | 0 .../elasticsearch/search/sort/SortMode.java | 0 .../elasticsearch/search/sort/SortOrder.java | 0 .../suggest/DirectSpellcheckerSettings.java | 0 .../elasticsearch/search/suggest/SortBy.java | 0 .../elasticsearch/search/suggest/Suggest.java | 0 .../search/suggest/SuggestBuilder.java | 0 .../search/suggest/SuggestBuilders.java | 0 .../search/suggest/SuggestPhase.java | 0 .../search/suggest/Suggester.java | 0 .../search/suggest/SuggestionBuilder.java | 0 .../suggest/SuggestionSearchContext.java | 0 .../completion/CompletionFieldStats.java | 0 .../suggest/completion/CompletionStats.java | 0 .../completion/CompletionSuggester.java | 0 .../completion/CompletionSuggestion.java | 0 .../CompletionSuggestionBuilder.java | 0 .../CompletionSuggestionContext.java | 0 .../suggest/completion/FuzzyOptions.java | 0 .../suggest/completion/RegexOptions.java | 0 .../context/CategoryContextMapping.java | 0 .../context/CategoryQueryContext.java | 0 .../completion/context/ContextBuilder.java | 0 .../completion/context/ContextMapping.java | 0 .../completion/context/ContextMappings.java | 0 .../completion/context/GeoContextMapping.java | 0 .../completion/context/GeoQueryContext.java | 0 .../completion/context/package-info.java | 0 .../suggest/completion/package-info.java | 0 .../search/suggest/package-info.java | 0 .../suggest/phrase/CandidateGenerator.java | 0 .../suggest/phrase/CandidateScorer.java | 0 .../search/suggest/phrase/Correction.java | 0 .../phrase/DirectCandidateGenerator.java | 0 .../DirectCandidateGeneratorBuilder.java | 0 .../search/suggest/phrase/Laplace.java | 0 .../search/suggest/phrase/LaplaceScorer.java | 0 .../phrase/LinearInterpolatingScorer.java | 0 .../suggest/phrase/LinearInterpolation.java | 0 .../MultiCandidateGeneratorWrapper.java | 0 .../phrase/NoisyChannelSpellChecker.java | 0 .../suggest/phrase/PhraseSuggester.java | 0 .../suggest/phrase/PhraseSuggestion.java | 0 .../phrase/PhraseSuggestionBuilder.java | 0 .../phrase/PhraseSuggestionContext.java | 0 .../search/suggest/phrase/SmoothingModel.java | 0 .../search/suggest/phrase/StupidBackoff.java | 0 .../suggest/phrase/StupidBackoffScorer.java | 0 .../search/suggest/phrase/WordScorer.java | 0 .../search/suggest/phrase/package-info.java | 0 .../search/suggest/term/TermSuggester.java | 0 .../search/suggest/term/TermSuggestion.java | 0 .../suggest/term/TermSuggestionBuilder.java | 0 .../suggest/term/TermSuggestionContext.java | 0 .../search/suggest/term/package-info.java | 0 .../ConcurrentSnapshotExecutionException.java | 0 .../InvalidSnapshotNameException.java | 0 .../elasticsearch/snapshots/RestoreInfo.java | 0 .../snapshots/RestoreService.java | 0 .../org/elasticsearch/snapshots/Snapshot.java | 0 .../snapshots/SnapshotCreationException.java | 0 .../snapshots/SnapshotException.java | 0 .../elasticsearch/snapshots/SnapshotId.java | 0 .../elasticsearch/snapshots/SnapshotInfo.java | 0 .../snapshots/SnapshotMissingException.java | 0 .../snapshots/SnapshotRestoreException.java | 0 .../snapshots/SnapshotShardFailure.java | 0 .../snapshots/SnapshotShardsService.java | 0 .../snapshots/SnapshotState.java | 0 .../snapshots/SnapshotUtils.java | 0 .../snapshots/SnapshotsService.java | 0 .../elasticsearch/tasks/CancellableTask.java | 0 .../tasks/LoggingTaskListener.java | 0 .../elasticsearch/tasks/RawTaskStatus.java | 0 .../java/org/elasticsearch/tasks/Task.java | 0 .../elasticsearch/tasks/TaskAwareRequest.java | 0 .../tasks/TaskCancelledException.java | 0 .../java/org/elasticsearch/tasks/TaskId.java | 0 .../org/elasticsearch/tasks/TaskInfo.java | 0 .../org/elasticsearch/tasks/TaskListener.java | 0 .../org/elasticsearch/tasks/TaskManager.java | 0 .../org/elasticsearch/tasks/TaskResult.java | 0 .../tasks/TaskResultsService.java | 0 .../org/elasticsearch/tasks/package-info.java | 0 .../AutoQueueAdjustingExecutorBuilder.java | 0 .../threadpool/ExecutorBuilder.java | 0 .../threadpool/FixedExecutorBuilder.java | 0 .../threadpool/ScalingExecutorBuilder.java | 0 .../elasticsearch/threadpool/Scheduler.java | 0 .../elasticsearch/threadpool/ThreadPool.java | 0 .../threadpool/ThreadPoolInfo.java | 0 .../threadpool/ThreadPoolStats.java | 0 .../ActionNotFoundTransportException.java | 0 .../transport/ActionTransportException.java | 0 .../transport/BindTransportException.java | 0 .../transport/BytesTransportRequest.java | 0 .../CompressibleBytesOutputStream.java | 0 .../transport/ConnectTransportException.java | 0 .../transport/ConnectionProfile.java | 0 .../EmptyTransportResponseHandler.java | 0 .../FutureTransportResponseHandler.java | 0 .../transport/NodeDisconnectedException.java | 0 .../transport/NodeNotConnectedException.java | 0 .../NodeShouldNotConnectException.java | 0 .../NotSerializableTransportException.java | 0 .../transport/PlainTransportFuture.java | 0 .../ReceiveTimeoutTransportException.java | 0 .../transport/RemoteClusterAware.java | 0 .../transport/RemoteClusterConnection.java | 0 .../transport/RemoteClusterService.java | 0 .../transport/RemoteConnectionInfo.java | 0 .../transport/RemoteTransportException.java | 0 .../transport/RequestHandlerRegistry.java | 0 ...ponseHandlerFailureTransportException.java | 0 .../SendRequestTransportException.java | 0 .../TaskAwareTransportRequestHandler.java | 0 .../transport/TaskTransportChannel.java | 0 .../elasticsearch/transport/TcpChannel.java | 0 .../elasticsearch/transport/TcpHeader.java | 0 .../elasticsearch/transport/TcpTransport.java | 0 .../transport/TcpTransportChannel.java | 0 .../elasticsearch/transport/Transport.java | 0 .../transport/TransportActionProxy.java | 0 .../transport/TransportChannel.java | 0 .../TransportChannelResponseHandler.java | 0 .../TransportConnectionListener.java | 0 .../transport/TransportException.java | 0 .../transport/TransportFuture.java | 0 .../transport/TransportInfo.java | 0 .../transport/TransportInterceptor.java | 0 .../transport/TransportMessage.java | 0 .../transport/TransportRequest.java | 0 .../transport/TransportRequestHandler.java | 0 .../transport/TransportRequestOptions.java | 0 .../transport/TransportResponse.java | 0 .../transport/TransportResponseHandler.java | 0 .../transport/TransportResponseOptions.java | 0 .../TransportSerializationException.java | 0 .../transport/TransportService.java | 0 .../transport/TransportStats.java | 0 .../transport/TransportStatus.java | 0 .../elasticsearch/transport/Transports.java | 0 .../org/elasticsearch/usage/UsageService.java | 0 .../watcher/AbstractResourceWatcher.java | 0 .../watcher/FileChangesListener.java | 0 .../elasticsearch/watcher/FileWatcher.java | 0 .../watcher/ResourceWatcher.java | 0 .../watcher/ResourceWatcherService.java | 0 .../elasticsearch/watcher/WatcherHandle.java | 0 .../time/format/StrictISODateTimeFormat.java | 0 .../services/org.apache.lucene.codecs.Codec | 0 .../org.apache.lucene.codecs.DocValuesFormat | 0 .../org.apache.lucene.codecs.PostingsFormat | 0 .../src/main/resources/config/favicon.ico | Bin .../elasticsearch/bootstrap/security.policy | 0 .../bootstrap/test-framework.policy | 0 .../elasticsearch/bootstrap/untrusted.policy | 0 .../index/mapper/default-mapping.json | 0 .../index/mapper/script-mapping.json | 0 .../tasks/task-index-mapping.json | 0 .../src/test/eclipse-build.gradle | 2 +- .../DeDuplicatingTokenFilterTests.java | 0 .../TruncateTokenFilterTests.java | 0 .../CollapsingTopDocsCollectorTests.java | 0 ...ndomBinaryDocValuesRangeQueryTestCase.java | 0 .../BinaryDocValuesRangeQueryTests.java | 0 .../lucene/queries/BlendedTermQueryTests.java | 0 ...eRandomBinaryDocValuesRangeQueryTests.java | 0 ...tRandomBinaryDocValuesRangeQueryTests.java | 0 ...sRandomBinaryDocValuesRangeQueryTests.java | 0 ...rRandomBinaryDocValuesRangeQueryTests.java | 0 ...gRandomBinaryDocValuesRangeQueryTests.java | 0 .../lucene/queries/MinDocQueryTests.java | 0 .../SearchAfterSortedDocQueryTests.java | 0 .../apache/lucene/search/QueriesTests.java | 0 .../BoundedBreakIteratorScannerTests.java | 0 .../CustomPassageFormatterTests.java | 0 .../CustomUnifiedHighlighterTests.java | 0 .../java/org/elasticsearch/BuildTests.java | 0 .../ElasticsearchExceptionTests.java | 0 .../ExceptionSerializationTests.java | 0 .../elasticsearch/SpecialPermissionTests.java | 0 .../java/org/elasticsearch/VersionTests.java | 0 .../action/ActionListenerTests.java | 0 .../action/ActionModuleTests.java | 0 .../action/DocWriteResponseTests.java | 0 .../action/ExplainRequestTests.java | 0 .../action/IndicesRequestIT.java | 0 .../action/ListenerActionIT.java | 0 .../action/NotifyOnceListenerTests.java | 0 .../action/OriginalIndicesTests.java | 0 .../action/RejectionActionIT.java | 0 .../ShardValidateQueryRequestTests.java | 0 .../action/admin/HotThreadsIT.java | 0 .../ClusterAllocationExplainActionTests.java | 0 .../ClusterAllocationExplainIT.java | 0 .../ClusterAllocationExplainRequestTests.java | 0 .../ClusterAllocationExplanationTests.java | 0 .../health/ClusterHealthRequestTests.java | 0 .../health/ClusterHealthResponsesTests.java | 0 .../TransportClusterHealthActionTests.java | 0 .../cluster/node/stats/NodeStatsTests.java | 0 .../node/tasks/CancellableTasksTests.java | 0 .../tasks/RecordingTaskManagerListener.java | 0 .../node/tasks/TaskManagerTestCase.java | 0 .../admin/cluster/node/tasks/TaskTests.java | 0 .../admin/cluster/node/tasks/TasksIT.java | 0 .../cluster/node/tasks/TestTaskPlugin.java | 0 .../node/tasks/TransportTasksActionTests.java | 0 .../repositories/RepositoryBlocksIT.java | 0 .../reroute/ClusterRerouteRequestTests.java | 0 .../cluster/reroute/ClusterRerouteTests.java | 0 .../settings/SettingsUpdaterTests.java | 0 .../ClusterSearchShardsRequestTests.java | 0 .../ClusterSearchShardsResponseTests.java | 0 .../cluster/snapshots/SnapshotBlocksIT.java | 0 .../snapshots/status/SnapshotStatusTests.java | 0 .../state/ClusterStateRequestTests.java | 0 .../admin/cluster/stats/ClusterStatsIT.java | 0 .../cluster/stats/ClusterStatsNodesTests.java | 0 .../GetStoredScriptRequestTests.java | 0 .../PutStoredScriptRequestTests.java | 0 .../cluster/tasks/PendingTasksBlocksIT.java | 0 .../indices/TransportAnalyzeActionTests.java | 0 .../indices/alias/AliasActionsTests.java | 0 .../indices/analyze/AnalyzeRequestTests.java | 0 .../clear/ClearIndicesCacheBlocksIT.java | 0 .../admin/indices/create/CreateIndexIT.java | 0 .../CreateIndexRequestBuilderTests.java | 0 .../create/CreateIndexRequestTests.java | 0 .../create/CreateIndexResponseTests.java | 0 .../admin/indices/create/ShrinkIndexIT.java | 0 .../admin/indices/create/SplitIndexIT.java | 0 .../indices/delete/DeleteIndexBlocksIT.java | 0 .../delete/DeleteIndexResponseTests.java | 0 .../admin/indices/exists/IndicesExistsIT.java | 0 .../admin/indices/flush/FlushBlocksIT.java | 0 .../indices/flush/SyncedFlushUnitTests.java | 0 .../forcemerge/ForceMergeBlocksIT.java | 0 .../action/admin/indices/get/GetIndexIT.java | 0 .../get/GetFieldMappingsResponseTests.java | 0 .../mapping/put/PutMappingRequestTests.java | 0 .../indices/open/OpenIndexResponseTests.java | 0 .../indices/refresh/RefreshBlocksIT.java | 0 .../indices/rollover/ConditionTests.java | 0 .../admin/indices/rollover/RolloverIT.java | 0 .../rollover/RolloverRequestTests.java | 0 .../TransportRolloverActionTests.java | 0 .../segments/IndicesSegmentsBlocksIT.java | 0 .../segments/IndicesSegmentsRequestTests.java | 0 .../shards/IndicesShardStoreRequestIT.java | 0 .../IndicesShardStoreResponseTests.java | 0 .../shrink/TransportResizeActionTests.java | 0 .../indices/stats/IndicesStatsBlocksIT.java | 0 .../stats/IndicesStatsResponseTests.java | 0 .../indices/stats/IndicesStatsTests.java | 0 .../MetaDataIndexTemplateServiceTests.java | 0 .../put/PutIndexTemplateRequestTests.java | 0 .../action/bulk/BackoffPolicyTests.java | 0 .../action/bulk/BulkIntegrationIT.java | 0 .../action/bulk/BulkItemResponseTests.java | 0 .../bulk/BulkProcessorClusterSettingsIT.java | 0 .../action/bulk/BulkProcessorIT.java | 0 .../action/bulk/BulkProcessorRetryIT.java | 0 .../action/bulk/BulkProcessorTests.java | 0 .../action/bulk/BulkRequestModifierTests.java | 0 .../action/bulk/BulkRequestTests.java | 0 .../action/bulk/BulkResponseTests.java | 0 .../action/bulk/BulkShardRequestTests.java | 0 .../action/bulk/BulkWithUpdatesIT.java | 0 .../elasticsearch/action/bulk/RetryTests.java | 0 ...ActionIndicesThatCannotBeCreatedTests.java | 0 .../bulk/TransportBulkActionIngestTests.java | 0 .../action/bulk/TransportBulkActionTests.java | 0 .../bulk/TransportBulkActionTookTests.java | 0 .../bulk/TransportShardBulkActionTests.java | 0 .../action/delete/DeleteResponseTests.java | 0 .../FieldCapabilitiesRequestTests.java | 0 .../FieldCapabilitiesResponseTests.java | 0 .../fieldcaps/FieldCapabilitiesTests.java | 0 .../action/get/GetResponseTests.java | 0 .../action/get/MultiGetRequestTests.java | 0 .../action/get/MultiGetShardRequestTests.java | 0 .../index/IndexRequestBuilderTests.java | 0 .../action/index/IndexRequestTests.java | 0 .../action/index/IndexResponseTests.java | 0 .../ingest/PutPipelineRequestTests.java | 0 .../SimulateDocumentSimpleResultTests.java | 0 .../ingest/SimulateExecutionServiceTests.java | 0 .../SimulatePipelineRequestParsingTests.java | 0 .../ingest/SimulatePipelineRequestTests.java | 0 .../ingest/SimulatePipelineResponseTests.java | 0 .../ingest/SimulateProcessorResultTests.java | 0 .../ingest/TrackingResultProcessorTests.java | 0 .../ingest/WritePipelineResponseTests.java | 0 .../ingest/WriteableIngestDocumentTests.java | 0 .../action/main/MainActionTests.java | 0 .../action/main/MainResponseTests.java | 0 .../resync/ResyncReplicationRequestTests.java | 0 .../AbstractSearchAsyncActionTests.java | 0 .../CanMatchPreFilterSearchPhaseTests.java | 0 .../search/ClearScrollControllerTests.java | 0 .../search/ClearScrollRequestTests.java | 0 .../action/search/CountedCollectorTests.java | 0 .../action/search/DfsQueryPhaseTests.java | 0 .../action/search/ExpandSearchPhaseTests.java | 0 .../action/search/FetchSearchPhaseTests.java | 0 .../action/search/MockSearchPhaseContext.java | 0 .../search/MultiSearchRequestTests.java | 0 .../search/MultiSearchResponseTests.java | 0 .../action/search/SearchAsyncActionTests.java | 0 .../search/SearchPhaseControllerTests.java | 0 .../SearchPhaseExecutionExceptionTests.java | 0 .../search/SearchRequestBuilderTests.java | 0 .../action/search/SearchResponseTests.java | 0 .../search/SearchScrollAsyncActionTests.java | 0 .../search/SearchScrollRequestTests.java | 0 .../search/ShardSearchFailureTests.java | 0 .../TransportMultiSearchActionTests.java | 0 .../search/TransportSearchActionTests.java | 0 .../search/TransportSearchHelperTests.java | 0 .../action/search/TransportSearchIT.java | 0 .../action/support/ActiveShardCountTests.java | 0 .../support/ActiveShardsObserverIT.java | 0 .../support/AdapterActionFutureTests.java | 0 .../action/support/AutoCreateIndexTests.java | 0 .../ContextPreservingActionListenerTests.java | 0 .../support/GroupedActionListenerTests.java | 0 .../action/support/IndicesOptionsTests.java | 0 .../support/ListenableActionFutureTests.java | 0 .../action/support/RefreshPolicyTests.java | 0 .../TransportActionFilterChainTests.java | 0 .../support/WaitActiveShardCountIT.java | 0 .../TransportBroadcastByNodeActionTests.java | 0 .../master/IndexingMasterFailoverIT.java | 0 .../TransportMasterNodeActionTests.java | 0 .../TransportMasterNodeActionUtils.java | 0 .../nodes/TransportNodesActionTests.java | 0 .../BroadcastReplicationTests.java | 0 .../ClusterStateCreationUtils.java | 0 .../ReplicationOperationTests.java | 0 .../replication/ReplicationResponseTests.java | 0 .../TransportReplicationActionTests.java | 0 .../TransportWriteActionTestHelper.java | 0 .../TransportWriteActionTests.java | 0 ...ortInstanceSingleOperationActionTests.java | 0 .../AbstractTermVectorsTestCase.java | 0 .../action/termvectors/GetTermVectorsIT.java | 0 .../termvectors/GetTermVectorsTests.java | 0 .../termvectors/MultiTermVectorsIT.java | 0 .../termvectors/TermVectorsUnitTests.java | 0 .../action/update/UpdateRequestTests.java | 0 .../action/update/UpdateResponseTests.java | 0 .../elasticsearch/aliases/IndexAliasesIT.java | 0 .../elasticsearch/blocks/SimpleBlocksIT.java | 0 .../bootstrap/BootstrapChecksTests.java | 0 .../bootstrap/BootstrapSettingsTests.java | 0 .../bootstrap/BootstrapTests.java | 0 .../bootstrap/ESPolicyTests.java | 0 .../bootstrap/ElasticsearchCliTests.java | 0 ...icsearchUncaughtExceptionHandlerTests.java | 0 .../bootstrap/JNANativesTests.java | 0 .../elasticsearch/bootstrap/JarHellTests.java | 0 .../bootstrap/JavaVersionTests.java | 0 .../bootstrap/MaxMapCountCheckTests.java | 0 .../bootstrap/SecurityTests.java | 0 .../broadcast/BroadcastActionsIT.java | 0 .../RecoveryWithUnsupportedIndicesIT.java | 0 .../bwcompat/RestoreBackwardsCompatIT.java | 0 .../org/elasticsearch/cli/CommandTests.java | 0 .../elasticsearch/cli/MultiCommandTests.java | 0 .../org/elasticsearch/cli/TerminalTests.java | 0 .../client/AbstractClientHeadersTestCase.java | 0 .../ParentTaskAssigningClientTests.java | 0 .../client/node/NodeClientHeadersTests.java | 0 .../client/node/NodeClientIT.java | 0 .../transport/FailAndRetryMockTransport.java | 0 .../client/transport/NodeDisconnectIT.java | 0 .../TransportClientHeadersTests.java | 0 .../client/transport/TransportClientIT.java | 0 .../TransportClientNodesServiceTests.java | 0 .../transport/TransportClientRetryIT.java | 0 .../transport/TransportClientTests.java | 0 .../cluster/ClusterChangedEventTests.java | 0 .../cluster/ClusterHealthIT.java | 0 .../cluster/ClusterInfoServiceIT.java | 0 .../cluster/ClusterInfoTests.java | 0 .../cluster/ClusterModuleTests.java | 0 .../cluster/ClusterStateDiffIT.java | 0 .../cluster/ClusterStateTests.java | 0 .../elasticsearch/cluster/DiskUsageTests.java | 0 .../cluster/GetClusterStateTests.java | 0 .../cluster/MinimumMasterNodesIT.java | 0 .../elasticsearch/cluster/NoMasterNodeIT.java | 0 .../cluster/NodeConnectionsServiceTests.java | 0 .../cluster/SimpleClusterStateIT.java | 0 .../cluster/SimpleDataNodesIT.java | 0 .../cluster/SnapshotsInProgressTests.java | 0 .../cluster/SpecificMasterNodesIT.java | 0 .../cluster/UpdateSettingsValidationIT.java | 0 .../ack/AckClusterUpdateSettingsIT.java | 0 .../org/elasticsearch/cluster/ack/AckIT.java | 0 ...rdFailedClusterStateTaskExecutorTests.java | 0 .../action/shard/ShardStateActionTests.java | 0 .../allocation/AwarenessAllocationIT.java | 0 .../cluster/allocation/ClusterRerouteIT.java | 0 .../allocation/FilteringAllocationIT.java | 0 .../allocation/SimpleAllocationIT.java | 0 .../cluster/block/ClusterBlockTests.java | 0 .../health/ClusterIndexHealthTests.java | 0 .../health/ClusterStateHealthTests.java | 0 .../cluster/metadata/AliasMetaDataTests.java | 0 .../cluster/metadata/AliasValidatorTests.java | 0 .../metadata/AutoExpandReplicasTests.java | 0 .../ClusterNameExpressionResolverTests.java | 0 .../DateMathExpressionResolverTests.java | 0 .../HumanReadableIndexSettingsTests.java | 0 .../metadata/IndexCreationTaskTests.java | 0 .../cluster/metadata/IndexGraveyardTests.java | 0 .../cluster/metadata/IndexMetaDataTests.java | 0 .../IndexNameExpressionResolverTests.java | 0 .../metadata/IndexTemplateMetaDataTests.java | 0 .../MetaDataCreateIndexServiceTests.java | 0 .../MetaDataDeleteIndexServiceTests.java | 0 .../MetaDataIndexAliasesServiceTests.java | 0 .../MetaDataIndexUpgradeServiceTests.java | 0 .../metadata/MetaDataMappingServiceTests.java | 0 .../cluster/metadata/MetaDataTests.java | 0 .../metadata/TemplateUpgradeServiceIT.java | 0 .../metadata/TemplateUpgradeServiceTests.java | 0 .../metadata/ToAndFromJsonMetaDataTests.java | 0 .../WildcardExpressionResolverTests.java | 0 .../node/DiscoveryNodeFiltersTests.java | 0 .../cluster/node/DiscoveryNodeTests.java | 0 .../cluster/node/DiscoveryNodesTests.java | 0 .../cluster/routing/AllocationIdTests.java | 0 .../cluster/routing/DelayedAllocationIT.java | 0 .../DelayedAllocationServiceTests.java | 0 .../routing/GroupShardsIteratorTests.java | 0 .../routing/OperationRoutingTests.java | 0 .../cluster/routing/PrimaryAllocationIT.java | 0 .../cluster/routing/PrimaryTermsTests.java | 0 .../routing/RandomShardRoutingMutator.java | 0 .../cluster/routing/RecoverySourceTests.java | 0 .../cluster/routing/RoutingServiceTests.java | 0 .../routing/RoutingTableGenerator.java | 0 .../cluster/routing/RoutingTableTests.java | 0 .../cluster/routing/ShardRoutingTests.java | 0 .../cluster/routing/UnassignedInfoTests.java | 0 .../allocation/AddIncrementallyTests.java | 0 .../AllocateUnassignedDecisionTests.java | 0 .../allocation/AllocationCommandsTests.java | 0 .../allocation/AllocationDecisionTests.java | 0 .../allocation/AllocationPriorityTests.java | 0 .../allocation/AwarenessAllocationTests.java | 0 .../allocation/BalanceConfigurationTests.java | 0 .../BalanceUnbalancedClusterTests.java | 0 .../allocation/BalancedSingleShardTests.java | 0 .../allocation/CatAllocationTestCase.java | 0 .../ClusterRebalanceRoutingTests.java | 0 .../ConcurrentRebalanceRoutingTests.java | 0 .../allocation/DeadNodesAllocationTests.java | 0 .../DecisionsImpactOnClusterHealthTests.java | 0 .../allocation/DiskThresholdMonitorTests.java | 0 .../DiskThresholdSettingsTests.java | 0 ...ReplicaAsPrimaryDuringRelocationTests.java | 0 .../ExpectedShardSizeAllocationTests.java | 0 .../allocation/FailedNodeRoutingTests.java | 0 .../allocation/FailedShardsRoutingTests.java | 0 .../allocation/FilterRoutingTests.java | 0 .../allocation/InSyncAllocationIdTests.java | 0 .../routing/allocation/IndexBalanceTests.java | 0 .../MaxRetryAllocationDeciderTests.java | 0 .../routing/allocation/MoveDecisionTests.java | 0 .../allocation/NodeAllocationResultTests.java | 0 .../NodeVersionAllocationDeciderTests.java | 0 ...alPrimariesToRelocatingPrimariesTests.java | 0 .../PreferPrimaryAllocationTests.java | 0 .../PrimaryElectionRoutingTests.java | 0 ...yNotRelocatedWhileBeingRecoveredTests.java | 0 .../RandomAllocationDeciderTests.java | 0 .../allocation/RebalanceAfterActiveTests.java | 0 .../ReplicaAllocatedAfterPrimaryTests.java | 0 .../ResizeAllocationDeciderTests.java | 0 .../RoutingNodesIntegrityTests.java | 0 .../routing/allocation/RoutingNodesUtils.java | 0 .../allocation/SameShardRoutingTests.java | 0 .../routing/allocation/ShardStateIT.java | 0 .../allocation/ShardVersioningTests.java | 0 .../ShardsLimitAllocationTests.java | 0 .../SingleShardNoReplicasRoutingTests.java | 0 .../SingleShardOneReplicaRoutingTests.java | 0 .../allocation/StartedShardsRoutingTests.java | 0 .../TenShardsOneReplicaRoutingTests.java | 0 .../allocation/ThrottlingAllocationTests.java | 0 .../UpdateNumberOfReplicasTests.java | 0 .../allocation/decider/DecisionTests.java | 0 .../decider/DiskThresholdDeciderTests.java | 0 .../DiskThresholdDeciderUnitTests.java | 0 .../decider/EnableAllocationTests.java | 0 .../decider/FilterAllocationDeciderTests.java | 0 .../allocation/decider/MockDiskUsagesIT.java | 0 ...storeInProgressAllocationDeciderTests.java | 0 .../UpdateShardAllocationSettingsIT.java | 0 .../murmur3/Murmur3HashFunctionTests.java | 0 .../ClusterSerializationTests.java | 0 .../ClusterStateToStringTests.java | 0 .../cluster/serialization/DiffableTests.java | 0 .../service/ClusterApplierServiceTests.java | 0 .../cluster/service/ClusterSerivceTests.java | 0 .../cluster/service/ClusterServiceIT.java | 0 .../cluster/service/MasterServiceTests.java | 0 .../cluster/service/TaskBatcherTests.java | 0 .../cluster/service/TaskExecutorTests.java | 0 .../cluster/settings/ClusterSettingsIT.java | 0 .../cluster/settings/SettingsFilteringIT.java | 0 .../cluster/shards/ClusterSearchShardsIT.java | 0 .../structure/RoutingIteratorTests.java | 0 .../elasticsearch/common/BooleansTests.java | 0 .../elasticsearch/common/ChannelsTests.java | 0 ...ponentiallyWeightedMovingAverageTests.java | 0 .../common/FieldMemoryStatsTests.java | 0 .../elasticsearch/common/NumbersTests.java | 0 .../elasticsearch/common/ParseFieldTests.java | 0 .../elasticsearch/common/PidFileTests.java | 0 .../elasticsearch/common/PriorityTests.java | 0 .../common/ReleasablesTests.java | 0 .../elasticsearch/common/StringsTests.java | 0 .../org/elasticsearch/common/TableTests.java | 0 .../org/elasticsearch/common/UUIDTests.java | 0 .../common/blobstore/BlobPathTests.java | 0 .../blobstore/FsBlobStoreContainerTests.java | 0 .../common/blobstore/FsBlobStoreTests.java | 0 .../breaker/MemoryCircuitBreakerTests.java | 0 .../bytes/ByteBufferReferenceTests.java | 0 .../common/bytes/BytesArrayTests.java | 0 .../bytes/CompositeBytesReferenceTests.java | 0 .../bytes/PagedBytesReferenceTests.java | 0 .../common/cache/CacheBuilderTests.java | 0 .../common/cache/CacheTests.java | 0 .../collect/CopyOnWriteHashMapTests.java | 0 .../common/collect/EvictingQueueTests.java | 0 .../common/collect/IteratorsTests.java | 0 .../common/compress/DeflateCompressTests.java | 0 .../DeflateCompressedXContentTests.java | 0 .../common/geo/BaseGeoParsingTestCase.java | 0 .../common/geo/GeoDistanceTests.java | 0 .../common/geo/GeoHashTests.java | 0 .../common/geo/GeoJsonShapeParserTests.java | 0 .../common/geo/GeoWKTShapeParserTests.java | 0 .../common/geo/ShapeBuilderTests.java | 0 .../common/geo/ShapeRelationTests.java | 0 .../common/geo/SpatialStrategyTests.java | 0 .../AbstractShapeBuilderTestCase.java | 0 .../geo/builders/CircleBuilderTests.java | 0 .../geo/builders/EnvelopeBuilderTests.java | 0 .../GeometryCollectionBuilderTests.java | 0 .../geo/builders/LineStringBuilderTests.java | 0 .../builders/MultiLineStringBuilderTests.java | 0 .../geo/builders/MultiPointBuilderTests.java | 0 .../builders/MultiPolygonBuilderTests.java | 0 .../geo/builders/PointBuilderTests.java | 0 .../geo/builders/PolygonBuilderTests.java | 0 .../common/hash/MessageDigestsTests.java | 0 .../common/hashing/MurmurHash3Tests.java | 0 .../common/hppc/HppcMapsTests.java | 0 .../common/io/FileSystemUtilsTests.java | 0 .../elasticsearch/common/io/StreamsTests.java | 0 .../stream/AbstractWriteableEnumTestCase.java | 0 .../common/io/stream/BytesStreamsTests.java | 0 .../stream/NamedWriteableRegistryTests.java | 0 .../ReleasableBytesStreamOutputTests.java | 0 .../common/io/stream/StreamTests.java | 0 .../common/joda/DateMathParserTests.java | 0 .../elasticsearch/common/joda/JodaTests.java | 0 .../logging/DeprecationLoggerTests.java | 0 .../common/lucene/LuceneTests.java | 0 .../common/lucene/ShardCoreKeyMapTests.java | 0 .../common/lucene/all/SimpleAllTests.java | 0 .../lucene/index/ESDirectoryReaderTests.java | 0 .../lucene/index/FreqTermsEnumTests.java | 0 .../search/MultiPhrasePrefixQueryTests.java | 0 .../search/function/MinScoreScorerTests.java | 0 .../morelikethis/MoreLikeThisQueryTests.java | 0 .../morelikethis/XMoreLikeThisTests.java | 0 .../store/ByteArrayIndexInputTests.java | 0 .../store/InputStreamIndexInputTests.java | 0 .../common/lucene/uid/VersionLookupTests.java | 0 .../common/lucene/uid/VersionsTests.java | 0 .../common/network/CidrsTests.java | 0 .../common/network/InetAddressesTests.java | 0 .../common/network/NetworkAddressTests.java | 0 .../common/network/NetworkModuleTests.java | 0 .../common/network/NetworkServiceTests.java | 0 .../common/network/NetworkUtilsTests.java | 0 .../common/path/PathTrieTests.java | 0 .../recycler/AbstractRecyclerTestCase.java | 0 .../recycler/ConcurrentRecyclerTests.java | 0 .../common/recycler/LockedRecyclerTests.java | 0 .../common/recycler/NoneRecyclerTests.java | 0 .../common/recycler/QueueRecyclerTests.java | 0 .../common/regex/RegexTests.java | 0 .../common/rounding/DateTimeUnitTests.java | 0 .../rounding/TimeZoneRoundingTests.java | 0 .../settings/AddFileKeyStoreCommandTests.java | 0 .../AddStringKeyStoreCommandTests.java | 0 .../settings/CreateKeyStoreCommandTests.java | 0 .../settings/KeyStoreCommandTestCase.java | 0 .../common/settings/KeyStoreWrapperTests.java | 0 .../settings/ListKeyStoreCommandTests.java | 0 .../settings/MemorySizeSettingsTests.java | 0 .../settings/PropertyPlaceholderTests.java | 0 .../RemoveSettingKeyStoreCommandTests.java | 0 .../common/settings/ScopedSettingsTests.java | 0 .../common/settings/SecureStringTests.java | 0 .../common/settings/SettingTests.java | 0 .../common/settings/SettingsFilterTests.java | 0 .../common/settings/SettingsModuleTests.java | 0 .../common/settings/SettingsTests.java | 0 .../transport/BoundTransportAddressTests.java | 0 .../common/unit/ByteSizeUnitTests.java | 0 .../common/unit/ByteSizeValueTests.java | 0 .../common/unit/DistanceUnitTests.java | 0 .../common/unit/FuzzinessTests.java | 0 .../common/unit/RatioValueTests.java | 0 .../common/unit/SizeValueTests.java | 0 .../common/unit/TimeValueTests.java | 0 .../common/util/ArrayUtilsTests.java | 0 .../common/util/BigArraysTests.java | 0 .../common/util/ByteUtilsTests.java | 0 .../common/util/BytesRefHashTests.java | 0 .../common/util/CancellableThreadsTests.java | 0 .../common/util/CollectionUtilsTests.java | 0 .../common/util/IndexFolderUpgraderTests.java | 0 .../common/util/LocaleUtilsTests.java | 0 .../common/util/LongHashTests.java | 0 .../common/util/LongObjectHashMapTests.java | 0 .../common/util/SingleObjectCacheTests.java | 0 .../common/util/URIPatternTests.java | 0 .../AbstractLifecycleRunnableTests.java | 0 .../concurrent/AbstractRunnableTests.java | 0 .../concurrent/AsyncIOProcessorTests.java | 0 .../util/concurrent/CountDownTests.java | 0 .../util/concurrent/EsExecutorsTests.java | 0 .../concurrent/EsThreadPoolExecutorTests.java | 0 .../util/concurrent/KeyedLockTests.java | 0 .../concurrent/PrioritizedExecutorsTests.java | 0 .../concurrent/PrioritizedRunnableTests.java | 0 ...ueueResizingEsThreadPoolExecutorTests.java | 0 .../util/concurrent/RefCountedTests.java | 0 .../ResizableBlockingQueueTests.java | 0 .../util/concurrent/ThreadContextTests.java | 0 .../util/concurrent/TimedRunnableTests.java | 0 .../common/util/iterable/IterablesTests.java | 0 .../common/util/set/SetsTests.java | 0 .../common/xcontent/BaseXContentTestCase.java | 0 .../ConstructingObjectParserTests.java | 0 .../common/xcontent/ObjectParserTests.java | 0 .../UnknownNamedObjectExceptionTests.java | 0 .../common/xcontent/XContentFactoryTests.java | 0 .../common/xcontent/XContentParserTests.java | 0 .../xcontent/XContentParserUtilsTests.java | 0 .../common/xcontent/XContentTypeTests.java | 0 .../builder/XContentBuilderTests.java | 0 .../cbor/CborXContentParserTests.java | 0 .../xcontent/cbor/CborXContentTests.java | 0 .../common/xcontent/cbor/JsonVsCborTests.java | 0 .../xcontent/json/JsonXContentTests.java | 0 .../xcontent/smile/JsonVsSmileTests.java | 0 .../xcontent/smile/SmileXContentTests.java | 0 .../support/AbstractFilteringTestCase.java | 0 .../xcontent/support/XContentHelperTests.java | 0 .../support/XContentMapValuesTests.java | 0 .../AbstractXContentFilteringTestCase.java | 0 .../filtering/CborXContentFilteringTests.java | 0 .../FilterPathGeneratorFilteringTests.java | 0 .../support/filtering/FilterPathTests.java | 0 .../filtering/JsonXContentFilteringTests.java | 0 .../SmileFilteringGeneratorTests.java | 0 .../YamlFilteringGeneratorTests.java | 0 .../xcontent/yaml/YamlXContentTests.java | 0 .../deps/jackson/JacksonLocationTests.java | 0 .../deps/joda/SimpleJodaTests.java | 0 .../deps/lucene/SimpleLuceneTests.java | 0 .../deps/lucene/VectorHighlighterTests.java | 0 .../discovery/AbstractDisruptionTestCase.java | 0 ...usterStatePublishResponseHandlerTests.java | 0 .../discovery/ClusterDisruptionIT.java | 0 .../discovery/DiscoveryDisruptionIT.java | 0 .../discovery/DiscoveryModuleTests.java | 0 .../discovery/MasterDisruptionIT.java | 0 .../discovery/SnapshotDisruptionIT.java | 0 .../discovery/ZenFaultDetectionTests.java | 0 .../single/SingleNodeDiscoveryIT.java | 0 .../single/SingleNodeDiscoveryTests.java | 0 .../zen/ElectMasterServiceTests.java | 0 .../discovery/zen/MembershipActionTests.java | 0 .../zen/NodeJoinControllerTests.java | 0 ...eRemovalClusterStateTaskExecutorTests.java | 0 .../zen/PendingClusterStatesQueueTests.java | 0 .../zen/PublishClusterStateActionTests.java | 0 .../discovery/zen/UnicastZenPingTests.java | 0 .../discovery/zen/ZenDiscoveryIT.java | 0 .../discovery/zen/ZenDiscoveryUnitTests.java | 0 .../discovery/zen/ZenPingTests.java | 0 .../AliasedIndexDocumentActionsIT.java | 0 .../document/DocumentActionsIT.java | 0 .../elasticsearch/document/ShardInfoIT.java | 0 .../elasticsearch/env/ESFileStoreTests.java | 0 .../elasticsearch/env/EnvironmentTests.java | 0 .../env/NodeEnvironmentTests.java | 0 .../explain/ExplainActionIT.java | 0 .../gateway/AsyncShardFetchTests.java | 0 .../gateway/DanglingIndicesStateTests.java | 0 .../gateway/GatewayIndexStateIT.java | 0 .../gateway/GatewayMetaStateTests.java | 0 .../gateway/GatewayServiceTests.java | 0 .../gateway/MetaDataStateFormatTests.java | 0 .../gateway/MetaDataWriteDataNodesIT.java | 0 .../gateway/MetaStateServiceTests.java | 0 .../gateway/PrimaryShardAllocatorTests.java | 0 .../gateway/PriorityComparatorTests.java | 0 .../gateway/QuorumGatewayIT.java | 0 .../gateway/RecoverAfterNodesIT.java | 0 .../gateway/RecoveryFromGatewayIT.java | 0 .../gateway/ReplicaShardAllocatorTests.java | 0 .../gateway/ReusePeerRecoverySharedTest.java | 0 .../org/elasticsearch/get/GetActionIT.java | 0 .../elasticsearch/index/IndexModuleTests.java | 0 .../index/IndexRequestBuilderIT.java | 0 .../index/IndexServiceTests.java | 0 .../index/IndexSettingsTests.java | 0 .../org/elasticsearch/index/IndexSortIT.java | 0 .../index/IndexSortSettingsTests.java | 0 .../org/elasticsearch/index/IndexTests.java | 0 .../index/IndexingSlowLogTests.java | 0 .../index/MergePolicySettingsTests.java | 0 .../index/MergeSchedulerSettingsTests.java | 0 .../index/SearchSlowLogTests.java | 0 .../index/SettingsListenerIT.java | 0 .../elasticsearch/index/VersionTypeTests.java | 0 .../index/WaitUntilRefreshIT.java | 0 .../index/analysis/AnalysisRegistryTests.java | 0 .../index/analysis/AnalysisTests.java | 0 .../index/analysis/CharMatcherTests.java | 0 .../analysis/CoreAnalysisFactoryTests.java | 0 .../index/analysis/CustomNormalizerTests.java | 0 .../analysis/FingerprintAnalyzerTests.java | 0 .../HunspellTokenFilterFactoryTests.java | 0 .../PathHierarchyTokenizerFactoryTests.java | 0 .../index/analysis/PatternAnalyzerTests.java | 0 .../index/analysis/PreBuiltAnalyzerTests.java | 0 .../ShingleTokenFilterFactoryTests.java | 0 .../index/analysis/SnowballAnalyzerTests.java | 0 .../index/analysis/StopAnalyzerTests.java | 0 .../index/analysis/StopTokenFilterTests.java | 0 .../WhitespaceTokenizerFactoryTests.java | 0 .../synonyms/SynonymsAnalysisTests.java | 0 .../cache/bitset/BitSetFilterCacheTests.java | 0 .../elasticsearch/index/codec/CodecTests.java | 0 .../engine/CombinedDeletionPolicyTests.java | 0 .../EngineSearcherTotalHitsMatcher.java | 0 .../index/engine/InternalEngineMergeIT.java | 0 .../engine/InternalEngineSettingsTests.java | 0 .../index/engine/InternalEngineTests.java | 0 .../index/engine/LiveVersionMapTests.java | 0 .../index/engine/SegmentTests.java | 0 .../index/engine/VersionValueTests.java | 0 .../AbstractFieldDataImplTestCase.java | 0 .../fielddata/AbstractFieldDataTestCase.java | 0 .../AbstractGeoFieldDataTestCase.java | 0 .../AbstractStringFieldDataTestCase.java | 0 .../fielddata/BinaryDVFieldDataTests.java | 0 .../index/fielddata/FieldDataCacheTests.java | 0 .../index/fielddata/FieldDataLoadingIT.java | 0 .../index/fielddata/FieldDataStatsTests.java | 0 .../index/fielddata/FieldDataTests.java | 0 .../index/fielddata/FilterFieldDataTests.java | 0 .../index/fielddata/GeoFieldDataTests.java | 0 .../fielddata/IndexFieldDataServiceTests.java | 0 .../NoOrdinalsStringFieldDataTests.java | 0 .../PagedBytesStringFieldDataTests.java | 0 .../fielddata/ScriptDocValuesDatesTests.java | 0 .../ScriptDocValuesGeoPointsTests.java | 0 .../fielddata/ScriptDocValuesLongsTests.java | 0 .../SortedSetDVStringFieldDataTests.java | 0 .../index/fielddata/UidFieldDataTests.java | 0 .../fieldcomparator/ReplaceMissingTests.java | 0 .../ordinals/MultiOrdinalsTests.java | 0 .../ordinals/SingleOrdinalsTests.java | 0 .../plain/HalfFloatFielddataTests.java | 0 .../FieldStatsProviderRefreshTests.java | 0 .../index/get/DocumentFieldTests.java | 0 .../index/get/GetResultTests.java | 0 .../index/mapper/AllFieldIT.java | 0 .../index/mapper/AllFieldMapperTests.java | 0 .../index/mapper/AllFieldTypeTests.java | 0 .../index/mapper/BinaryFieldMapperTests.java | 0 .../index/mapper/BinaryFieldTypeTests.java | 0 .../index/mapper/BinaryRangeUtilTests.java | 0 .../index/mapper/BooleanFieldMapperTests.java | 0 .../index/mapper/BooleanFieldTypeTests.java | 0 .../index/mapper/CamelCaseFieldNameTests.java | 0 .../mapper/CompletionFieldMapperTests.java | 0 .../mapper/CompletionFieldTypeTests.java | 0 .../mapper/CopyToMapperIntegrationIT.java | 0 .../index/mapper/CopyToMapperTests.java | 0 .../index/mapper/DateFieldMapperTests.java | 0 .../index/mapper/DateFieldTypeTests.java | 0 .../mapper/DocumentFieldMapperTests.java | 0 .../mapper/DocumentMapperMergeTests.java | 0 .../mapper/DocumentMapperParserTests.java | 0 .../index/mapper/DocumentParserTests.java | 0 .../index/mapper/DoubleIndexingDocTests.java | 0 .../index/mapper/DynamicMappingIT.java | 0 .../index/mapper/DynamicMappingTests.java | 0 .../mapper/DynamicMappingVersionTests.java | 0 .../index/mapper/DynamicTemplateTests.java | 0 .../index/mapper/DynamicTemplatesTests.java | 0 .../mapper/ExternalFieldMapperTests.java | 0 .../index/mapper/ExternalMapper.java | 0 .../index/mapper/ExternalMapperPlugin.java | 0 .../index/mapper/ExternalMetadataMapper.java | 0 .../ExternalValuesMapperIntegrationIT.java | 0 .../index/mapper/FakeStringFieldMapper.java | 0 .../mapper/FieldFilterMapperPluginTests.java | 0 .../mapper/FieldNamesFieldMapperTests.java | 0 .../mapper/FieldNamesFieldTypeTests.java | 0 .../index/mapper/FieldTypeLookupTests.java | 0 .../GenericStoreDynamicTemplateTests.java | 0 .../mapper/GeoPointFieldMapperTests.java | 0 .../index/mapper/GeoPointFieldTypeTests.java | 0 .../mapper/GeoShapeFieldMapperTests.java | 0 .../index/mapper/GeoShapeFieldTypeTests.java | 0 .../index/mapper/IdFieldMapperTests.java | 0 .../index/mapper/IdFieldTypeTests.java | 0 .../index/mapper/IndexFieldMapperTests.java | 0 .../index/mapper/IndexFieldTypeTests.java | 0 .../index/mapper/IpFieldMapperTests.java | 0 .../index/mapper/IpFieldTypeTests.java | 0 .../index/mapper/IpRangeFieldMapperTests.java | 0 .../mapper/JavaMultiFieldMergeTests.java | 0 .../index/mapper/KeywordFieldMapperTests.java | 0 .../index/mapper/KeywordFieldTypeTests.java | 0 .../index/mapper/MapperServiceTests.java | 0 .../index/mapper/MapperTests.java | 0 .../mapper/MultiFieldCopyToMapperTests.java | 0 .../MultiFieldIncludeInAllMapperTests.java | 0 .../index/mapper/MultiFieldTests.java | 0 .../mapper/MultiFieldsIntegrationIT.java | 0 .../index/mapper/NestedObjectMapperTests.java | 0 .../mapper/NullValueObjectMappingTests.java | 0 .../index/mapper/NullValueTests.java | 0 .../index/mapper/NumberFieldMapperTests.java | 0 .../index/mapper/NumberFieldTypeTests.java | 0 .../index/mapper/ObjectMapperTests.java | 0 .../index/mapper/ParentFieldMapperTests.java | 0 .../index/mapper/ParentFieldTypeTests.java | 0 .../index/mapper/PathMapperTests.java | 0 .../mapper/PathMatchDynamicTemplateTests.java | 0 .../index/mapper/RangeFieldMapperTests.java | 0 ...angeFieldQueryStringQueryBuilderTests.java | 0 .../index/mapper/RangeFieldTypeTests.java | 0 .../index/mapper/RootObjectMapperTests.java | 0 .../index/mapper/RoutingFieldMapperTests.java | 0 .../index/mapper/RoutingFieldTypeTests.java | 0 .../index/mapper/SourceFieldMapperTests.java | 0 .../index/mapper/SourceFieldTypeTests.java | 0 .../mapper/StoredNumericValuesTests.java | 0 .../index/mapper/TextFieldMapperTests.java | 0 .../index/mapper/TextFieldTypeTests.java | 0 .../index/mapper/TypeFieldMapperTests.java | 0 .../index/mapper/TypeFieldTypeTests.java | 0 .../index/mapper/UidFieldMapperTests.java | 0 .../index/mapper/UidFieldTypeTests.java | 0 .../elasticsearch/index/mapper/UidTests.java | 0 .../mapper/UpdateMappingOnClusterIT.java | 0 .../index/mapper/UpdateMappingTests.java | 0 .../index/mapper/VersionFieldTypeTests.java | 0 .../index/mapper/package-info.java | 0 .../query/AbstractQueryBuilderTests.java | 0 .../query/AbstractTermQueryTestCase.java | 0 .../index/query/BoolQueryBuilderTests.java | 0 .../query/BoostingQueryBuilderTests.java | 0 .../index/query/CombineFunctionTests.java | 0 .../query/CommonTermsQueryBuilderTests.java | 0 .../query/CommonTermsQueryParserTests.java | 0 .../query/ConstantScoreQueryBuilderTests.java | 0 .../index/query/DisMaxQueryBuilderTests.java | 0 .../index/query/DisableGraphQueryTests.java | 0 .../index/query/ExistsQueryBuilderTests.java | 0 .../FieldMaskingSpanQueryBuilderTests.java | 0 .../index/query/FuzzyQueryBuilderTests.java | 0 .../GeoBoundingBoxQueryBuilderTests.java | 0 .../query/GeoDistanceQueryBuilderTests.java | 0 .../query/GeoPolygonQueryBuilderTests.java | 0 .../query/GeoShapeQueryBuilderTests.java | 0 .../index/query/IdsQueryBuilderTests.java | 0 .../index/query/InnerHitBuilderTests.java | 0 .../query/MatchAllQueryBuilderTests.java | 0 .../query/MatchNoneQueryBuilderTests.java | 0 .../MatchPhrasePrefixQueryBuilderTests.java | 0 .../query/MatchPhraseQueryBuilderTests.java | 0 .../index/query/MatchQueryBuilderTests.java | 0 .../index/query/MockRepeatAnalyzer.java | 0 .../query/MoreLikeThisQueryBuilderTests.java | 0 .../query/MultiMatchQueryBuilderTests.java | 0 .../index/query/NestedQueryBuilderTests.java | 0 .../index/query/OperatorTests.java | 0 .../index/query/PrefixQueryBuilderTests.java | 0 .../index/query/QueryShardContextTests.java | 0 .../query/QueryStringQueryBuilderTests.java | 0 .../index/query/RandomQueryBuilder.java | 0 .../index/query/RangeQueryBuilderTests.java | 0 .../index/query/RangeQueryRewriteTests.java | 0 .../index/query/RegexpQueryBuilderTests.java | 0 .../index/query/RewriteableTests.java | 0 .../index/query/ScoreModeTests.java | 0 .../index/query/ScriptQueryBuilderTests.java | 0 .../query/SimpleQueryStringBuilderTests.java | 0 .../SpanContainingQueryBuilderTests.java | 0 .../query/SpanFirstQueryBuilderTests.java | 0 .../query/SpanMultiTermQueryBuilderTests.java | 0 .../query/SpanNearQueryBuilderTests.java | 0 .../index/query/SpanNotQueryBuilderTests.java | 0 .../index/query/SpanOrQueryBuilderTests.java | 0 .../query/SpanTermQueryBuilderTests.java | 0 .../query/SpanWithinQueryBuilderTests.java | 0 .../index/query/TermQueryBuilderTests.java | 0 .../index/query/TermsQueryBuilderTests.java | 0 .../query/TermsSetQueryBuilderTests.java | 0 .../index/query/TypeQueryBuilderTests.java | 0 .../query/WildcardQueryBuilderTests.java | 0 .../index/query/WrapperQueryBuilderTests.java | 0 ...FieldValueFactorFunctionModifierTests.java | 0 .../FunctionScoreEquivalenceTests.java | 0 .../FunctionScoreQueryBuilderTests.java | 0 .../functionscore/FunctionScoreTests.java | 0 .../ScoreFunctionBuilderTests.java | 0 .../query/plugin/CustomQueryParserIT.java | 0 .../index/query/plugin/DummyQueryBuilder.java | 0 .../query/plugin/DummyQueryParserPlugin.java | 0 .../index/refresh/RefreshStatsTests.java | 0 .../AbstractBulkByScrollRequestTestCase.java | 0 .../reindex/BulkByScrollResponseTests.java | 0 .../reindex/BulkByScrollTaskStatusTests.java | 0 .../index/reindex/BulkByScrollTaskTests.java | 0 .../reindex/DeleteByQueryRequestTests.java | 0 .../LeaderBulkByScrollTaskStateTests.java | 0 .../index/reindex/ReindexRequestTests.java | 0 .../reindex/UpdateByQueryRequestTests.java | 0 .../WorkerBulkByScrollTaskStateTests.java | 0 .../ESIndexLevelReplicationTestCase.java | 0 .../IndexLevelReplicationTests.java | 0 .../RecoveryDuringReplicationTests.java | 0 .../search/ESToParentBlockJoinQueryTests.java | 0 .../index/search/MatchQueryIT.java | 0 .../index/search/MultiMatchQueryTests.java | 0 .../index/search/NestedHelperTests.java | 0 .../search/geo/GeoPointParsingTests.java | 0 .../index/search/geo/GeoUtilsTests.java | 0 .../AbstractNumberNestedSortingTestCase.java | 0 .../nested/DoubleNestedSortingTests.java | 0 .../nested/FloatNestedSortingTests.java | 0 .../search/nested/LongNestedSortingTests.java | 0 .../search/nested/NestedSortingTests.java | 0 .../index/seqno/CountedBitSetTests.java | 0 .../GlobalCheckpointSyncActionTests.java | 0 .../index/seqno/GlobalCheckpointSyncIT.java | 0 .../seqno/GlobalCheckpointTrackerTests.java | 0 .../seqno/LocalCheckpointTrackerTests.java | 0 .../index/seqno/SequenceNumbersTests.java | 0 .../index/shard/DocsStatsTests.java | 0 .../index/shard/EngineAccess.java | 0 .../shard/IndexSearcherWrapperTests.java | 0 .../index/shard/IndexShardIT.java | 0 .../IndexShardOperationPermitsTests.java | 0 .../index/shard/IndexShardTests.java | 0 .../shard/IndexingOperationListenerTests.java | 0 .../index/shard/NewPathForShardTests.java | 0 .../shard/PrimaryReplicaSyncerTests.java | 0 .../index/shard/RefreshListenersTests.java | 0 .../shard/SearchOperationListenerTests.java | 0 .../index/shard/ShardIdTests.java | 0 .../index/shard/ShardPathTests.java | 0 .../index/shard/ShardSplittingQueryTests.java | 0 .../index/shard/ShardUtilsTests.java | 0 .../index/shard/StoreRecoveryTests.java | 0 .../similarity/ScriptedSimilarityTests.java | 0 .../similarity/SimilarityServiceTests.java | 0 .../index/similarity/SimilarityTests.java | 0 .../snapshots/blobstore/FileInfoTests.java | 0 .../blobstore/SlicedInputStreamTests.java | 0 .../index/store/CorruptedFileIT.java | 0 .../index/store/CorruptedTranslogIT.java | 0 .../index/store/DirectoryUtilsTests.java | 0 .../index/store/ExceptionRetryIT.java | 0 .../index/store/FsDirectoryServiceTests.java | 0 .../index/store/IndexStoreTests.java | 0 .../elasticsearch/index/store/StoreTests.java | 0 .../suggest/stats/CompletionsStatsTests.java | 0 .../index/suggest/stats/SuggestStatsIT.java | 0 .../termvectors/TermVectorsServiceTests.java | 0 .../index/translog/MultiSnapshotTests.java | 0 .../index/translog/SnapshotMatchers.java | 0 .../index/translog/TestTranslog.java | 0 .../translog/TranslogDeletionPolicyTests.java | 0 .../index/translog/TranslogTests.java | 0 .../index/translog/TranslogVersionTests.java | 0 .../index/translog/TruncateTranslogIT.java | 0 .../elasticsearch/indexing/IndexActionIT.java | 0 .../IndexLifecycleActionIT.java | 0 ...DateMathIndexExpressionsIntegrationIT.java | 0 .../IndexingMemoryControllerTests.java | 0 .../indices/IndicesLifecycleListenerIT.java | 0 ...dicesLifecycleListenerSingleNodeTests.java | 0 .../indices/IndicesModuleTests.java | 0 .../indices/IndicesOptionsIntegrationIT.java | 0 .../indices/IndicesQueryCacheTests.java | 0 .../indices/IndicesRequestCacheIT.java | 0 .../indices/IndicesRequestCacheTests.java | 0 .../indices/IndicesServiceTests.java | 0 .../indices/NodeIndicesStatsTests.java | 0 .../indices/TermsLookupTests.java | 0 .../indices/analysis/AnalysisModuleTests.java | 0 .../PreBuiltAnalyzerIntegrationIT.java | 0 .../indices/analyze/AnalyzeActionIT.java | 0 .../indices/analyze/HunspellServiceTests.java | 0 ...actIndicesClusterStateServiceTestCase.java | 0 .../indices/cluster/ClusterStateChanges.java | 0 ...ClusterStateServiceRandomUpdatesTests.java | 0 .../exists/indices/IndicesExistsIT.java | 0 .../indices/exists/types/TypesExistsIT.java | 0 .../elasticsearch/indices/flush/FlushIT.java | 0 .../flush/SyncedFlushSingleNodeTests.java | 0 .../indices/flush/SyncedFlushUtil.java | 0 .../mapping/ConcurrentDynamicTemplateIT.java | 0 .../DedicatedMasterGetFieldMappingIT.java | 0 .../mapping/SimpleGetFieldMappingsIT.java | 0 .../indices/mapping/SimpleGetMappingsIT.java | 0 .../mapping/UpdateMappingIntegrationIT.java | 0 .../memory/breaker/CircuitBreakerNoopIT.java | 0 .../breaker/CircuitBreakerServiceIT.java | 0 .../breaker/CircuitBreakerUnitTests.java | 0 .../RandomExceptionCircuitBreakerIT.java | 0 .../recovery/IndexPrimaryRelocationIT.java | 0 .../indices/recovery/IndexRecoveryIT.java | 0 .../PeerRecoverySourceServiceTests.java | 0 .../PeerRecoveryTargetServiceTests.java | 0 .../RecoverySettingsDynamicUpdateTests.java | 0 .../recovery/RecoverySourceHandlerTests.java | 0 .../indices/recovery/RecoveryStatusTests.java | 0 .../indices/recovery/RecoveryTargetTests.java | 0 .../indices/recovery/RecoveryTests.java | 0 .../recovery/StartRecoveryRequestTests.java | 0 .../indices/settings/GetSettingsBlocksIT.java | 0 .../settings/UpdateNumberOfReplicasIT.java | 0 .../indices/settings/UpdateSettingsIT.java | 0 .../state/CloseIndexDisableCloseAllIT.java | 0 .../indices/state/OpenCloseIndexIT.java | 0 .../indices/state/RareClusterStateIT.java | 0 .../indices/state/SimpleIndexStateIT.java | 0 .../indices/stats/IndexStatsIT.java | 0 .../store/IndicesStoreIntegrationIT.java | 0 .../indices/store/IndicesStoreTests.java | 0 .../template/IndexTemplateBlocksIT.java | 0 .../template/SimpleIndexTemplateIT.java | 0 .../ingest/CompoundProcessorTests.java | 0 .../ingest/ConfigurationUtilsTests.java | 0 .../elasticsearch/ingest/IngestClientIT.java | 0 .../ingest/IngestDocumentTests.java | 0 .../ingest/IngestMetadataTests.java | 0 ...gestProcessorNotInstalledOnAllNodesIT.java | 0 .../ingest/IngestServiceTests.java | 0 .../ingest/IngestStatsTests.java | 0 .../ingest/PipelineConfigurationTests.java | 0 .../ingest/PipelineExecutionServiceTests.java | 0 .../ingest/PipelineFactoryTests.java | 0 .../ingest/PipelineStoreTests.java | 0 .../ingest/ValueSourceTests.java | 0 .../org/elasticsearch/mget/SimpleMgetIT.java | 0 .../monitor/fs/DeviceStatsTests.java | 0 .../monitor/fs/FsProbeTests.java | 0 .../jvm/JvmGcMonitorServiceSettingsTests.java | 0 .../monitor/jvm/JvmGcMonitorServiceTests.java | 0 .../monitor/jvm/JvmInfoTests.java | 0 .../monitor/jvm/JvmMonitorTests.java | 0 .../monitor/jvm/JvmStatsTests.java | 0 .../monitor/os/OsProbeTests.java | 0 .../monitor/os/OsStatsTests.java | 0 .../monitor/process/ProcessProbeTests.java | 0 .../node/InternalSettingsPreparerTests.java | 0 .../org/elasticsearch/node/NodeTests.java | 0 .../node/ResponseCollectorServiceTests.java | 0 .../node/service/NodeServiceTests.java | 0 .../nodesinfo/NodeInfoStreamingTests.java | 0 .../nodesinfo/SimpleNodesInfoIT.java | 0 .../DestructiveOperationsIT.java | 0 .../plugins/MetaPluginInfoTests.java | 0 .../plugins/PluginInfoTests.java | 0 .../plugins/PluginsServiceTests.java | 0 .../elasticsearch/plugins/PluginsTests.java | 0 .../spi/NamedXContentProviderTests.java | 0 .../recovery/FullRollingRestartIT.java | 0 .../recovery/RecoveriesCollectionTests.java | 0 .../recovery/RecoveryWhileUnderLoadIT.java | 0 .../elasticsearch/recovery/RelocationIT.java | 0 .../recovery/SimpleRecoveryIT.java | 0 .../recovery/TruncatedRecoveryIT.java | 0 .../repositories/IndexIdTests.java | 0 .../repositories/RepositoryDataTests.java | 0 .../BlobStoreRepositoryRestoreTests.java | 0 .../blobstore/BlobStoreRepositoryTests.java | 0 .../rest/BaseRestHandlerTests.java | 0 .../rest/BytesRestResponseTests.java | 0 .../rest/DeprecationRestHandlerTests.java | 0 .../rest/RestControllerTests.java | 0 .../rest/RestHttpResponseHeadersTests.java | 0 .../elasticsearch/rest/RestRequestTests.java | 0 .../elasticsearch/rest/RestUtilsTests.java | 0 .../rest/action/RestActionsTests.java | 0 .../rest/action/RestBuilderListenerTests.java | 0 .../rest/action/RestMainActionTests.java | 0 .../cluster/RestNodesStatsActionTests.java | 0 .../admin/indices/RestAnalyzeActionTests.java | 0 .../RestClearIndicesCacheActionTests.java | 0 .../indices/RestIndicesStatsActionTests.java | 0 .../action/cat/RestIndicesActionTests.java | 0 .../action/cat/RestRecoveryActionTests.java | 0 .../rest/action/cat/RestTableTests.java | 0 .../action/document/RestBulkActionTests.java | 0 .../routing/AliasResolveRoutingIT.java | 0 .../elasticsearch/routing/AliasRoutingIT.java | 0 .../routing/PartitionedRoutingIT.java | 0 .../routing/SimpleRoutingIT.java | 0 .../script/ClassPermissionTests.java | 0 .../script/ScriptContextTests.java | 0 .../script/ScriptExceptionTests.java | 0 .../script/ScriptMetaDataTests.java | 0 .../script/ScriptServiceTests.java | 0 .../org/elasticsearch/script/ScriptTests.java | 0 .../script/StoredScriptSourceTests.java | 0 .../script/StoredScriptTests.java | 0 .../elasticsearch/script/StoredScriptsIT.java | 0 .../search/AbstractSearchTestCase.java | 0 .../search/ClearScrollResponseTests.java | 0 .../search/DocValueFormatTests.java | 0 .../search/MultiValueModeTests.java | 0 .../search/NestedIdentityTests.java | 0 .../search/SearchCancellationIT.java | 0 .../search/SearchCancellationTests.java | 0 .../elasticsearch/search/SearchHitTests.java | 0 .../elasticsearch/search/SearchHitsTests.java | 0 .../search/SearchModuleTests.java | 0 .../search/SearchRequestTests.java | 0 .../search/SearchServiceTests.java | 0 .../search/SearchSortValuesTests.java | 0 .../elasticsearch/search/SearchTimeoutIT.java | 0 .../search/SearchWithRejectionsIT.java | 0 .../search/StressSearchServiceReaperIT.java | 0 .../AggregationCollectorTests.java | 0 .../AggregationTestScriptsPlugin.java | 0 .../AggregationsIntegrationIT.java | 0 .../aggregations/AggregationsTests.java | 0 .../AggregatorFactoriesTests.java | 0 .../BasePipelineAggregationTestCase.java | 0 .../search/aggregations/CombiIT.java | 0 .../search/aggregations/EquivalenceIT.java | 0 .../aggregations/FiltersAggsRewriteIT.java | 0 .../aggregations/InternalOrderTests.java | 0 .../search/aggregations/MetaDataIT.java | 0 .../search/aggregations/MissingValueIT.java | 0 .../MultiBucketAggregatorWrapperTests.java | 0 .../SubAggCollectionModeTests.java | 0 .../bucket/AdjacencyMatrixIT.java | 0 .../BestBucketsDeferringCollectorTests.java | 0 .../aggregations/bucket/BooleanTermsIT.java | 0 .../aggregations/bucket/BucketUtilsTests.java | 0 .../aggregations/bucket/DateHistogramIT.java | 0 .../bucket/DateHistogramOffsetIT.java | 0 .../bucket/DateHistogramTests.java | 0 .../aggregations/bucket/DateRangeIT.java | 0 .../aggregations/bucket/DateRangeTests.java | 0 .../bucket/DateScriptMocksPlugin.java | 0 .../bucket/DiversifiedSamplerIT.java | 0 .../aggregations/bucket/DoubleTermsIT.java | 0 .../search/aggregations/bucket/FilterIT.java | 0 .../aggregations/bucket/FilterTests.java | 0 .../search/aggregations/bucket/FiltersIT.java | 0 .../aggregations/bucket/FiltersTests.java | 0 .../aggregations/bucket/GeoDistanceIT.java | 0 .../bucket/GeoDistanceRangeTests.java | 0 .../aggregations/bucket/GeoHashGridIT.java | 0 .../aggregations/bucket/GeoHashGridTests.java | 0 .../bucket/GlobalAggregatorTests.java | 0 .../search/aggregations/bucket/GlobalIT.java | 0 .../aggregations/bucket/GlobalTests.java | 0 .../aggregations/bucket/HistogramIT.java | 0 .../aggregations/bucket/HistogramTests.java | 0 .../search/aggregations/bucket/IpRangeIT.java | 0 .../aggregations/bucket/IpRangeTests.java | 0 .../search/aggregations/bucket/IpTermsIT.java | 0 .../aggregations/bucket/LongTermsIT.java | 0 .../aggregations/bucket/MinDocCountIT.java | 0 .../search/aggregations/bucket/MissingIT.java | 0 .../aggregations/bucket/MissingTests.java | 0 .../aggregations/bucket/NaNSortingIT.java | 0 .../search/aggregations/bucket/NestedIT.java | 0 .../aggregations/bucket/ParentIdAggIT.java | 0 .../search/aggregations/bucket/RangeIT.java | 0 .../aggregations/bucket/RangeTests.java | 0 .../aggregations/bucket/ReverseNestedIT.java | 0 .../search/aggregations/bucket/SamplerIT.java | 0 .../aggregations/bucket/SamplerTests.java | 0 .../aggregations/bucket/ShardReduceIT.java | 0 .../aggregations/bucket/ShardSizeTermsIT.java | 0 .../bucket/ShardSizeTestCase.java | 0 .../SignificantTermsSignificanceScoreIT.java | 0 .../bucket/SignificantTermsTests.java | 0 .../bucket/SignificantTextTests.java | 0 .../bucket/TermsDocCountErrorIT.java | 0 .../bucket/TermsShardMinDocCountIT.java | 0 .../aggregations/bucket/TermsTests.java | 0 .../InternalAdjacencyMatrixTests.java | 0 .../CompositeAggregationBuilderTests.java | 0 .../composite/CompositeAggregatorTests.java | 0 .../composite/InternalCompositeTests.java | 0 .../bucket/filter/FilterAggregatorTests.java | 0 .../bucket/filter/FiltersAggregatorTests.java | 0 .../bucket/filter/InternalFilterTests.java | 0 .../bucket/filter/InternalFiltersTests.java | 0 .../geogrid/GeoHashGridAggregatorTests.java | 0 .../geogrid/GeoHashGridParserTests.java | 0 .../geogrid/InternalGeoHashGridTests.java | 0 .../bucket/global/InternalGlobalTests.java | 0 .../DateHistogramAggregatorTests.java | 0 .../bucket/histogram/ExtendedBoundsTests.java | 0 .../histogram/HistogramAggregatorTests.java | 0 .../histogram/InternalDateHistogramTests.java | 0 .../histogram/InternalHistogramTests.java | 0 .../bucket/missing/InternalMissingTests.java | 0 .../missing/MissingAggregatorTests.java | 0 .../bucket/nested/InternalNestedTests.java | 0 .../nested/InternalReverseNestedTests.java | 0 .../bucket/nested/NestedAggregatorTests.java | 0 .../bucket/nested/NestedTests.java | 0 .../nested/ReverseNestedAggregatorTests.java | 0 .../bucket/nested/ReverseNestedTests.java | 0 .../range/BinaryRangeAggregatorTests.java | 0 .../range/InternalBinaryRangeTests.java | 0 .../bucket/range/InternalDateRangeTests.java | 0 .../range/InternalGeoDistanceTests.java | 0 .../bucket/range/InternalRangeTestCase.java | 0 .../bucket/range/InternalRangeTests.java | 0 .../bucket/range/IpRangeAggregatorTests.java | 0 .../BestDocsDeferringCollectorTests.java | 0 .../DiversifiedAggregationBuilderTests.java | 0 .../sampler/DiversifiedSamplerTests.java | 0 .../bucket/sampler/InternalSamplerTests.java | 0 .../sampler/SamplerAggregatorTests.java | 0 .../InternalSignificantTermsTestCase.java | 0 .../SignificanceHeuristicTests.java | 0 .../SignificantLongTermsTests.java | 0 .../SignificantStringTermsTests.java | 0 .../SignificantTermsAggregatorTests.java | 0 .../SignificantTextAggregatorTests.java | 0 .../bucket/terms/DoubleTermsTests.java | 0 .../bucket/terms/InternalTermsTestCase.java | 0 .../bucket/terms/LongTermsTests.java | 0 .../bucket/terms/StringTermsIT.java | 0 .../bucket/terms/StringTermsTests.java | 0 .../terms/TermsAggregatorFactoryTests.java | 0 .../bucket/terms/TermsAggregatorTests.java | 0 .../metrics/AbstractGeoTestCase.java | 0 .../AbstractNumericMetricTestCase.java | 0 .../metrics/AdjacencyMatrixTests.java | 0 .../search/aggregations/metrics/AvgIT.java | 0 .../search/aggregations/metrics/AvgTests.java | 0 .../metrics/CardinalityAggregatorTests.java | 0 .../aggregations/metrics/CardinalityIT.java | 0 .../metrics/ExtendedStatsAggregatorTests.java | 0 .../aggregations/metrics/ExtendedStatsIT.java | 0 .../metrics/ExtendedStatsTests.java | 0 .../aggregations/metrics/GeoBoundsIT.java | 0 .../aggregations/metrics/GeoBoundsTests.java | 0 .../aggregations/metrics/GeoCentroidIT.java | 0 .../metrics/GeoCentroidTests.java | 0 .../metrics/HDRPercentileRanksIT.java | 0 .../metrics/HDRPercentilesIT.java | 0 .../metrics/InternalExtendedStatsTests.java | 0 .../metrics/InternalMaxTests.java | 0 .../metrics/InternalMinTests.java | 0 .../metrics/InternalStatsBucketTests.java | 0 .../metrics/InternalStatsTests.java | 0 .../metrics/InternalSumTests.java | 0 .../metrics/MaxAggregatorTests.java | 0 .../search/aggregations/metrics/MaxIT.java | 0 .../search/aggregations/metrics/MaxTests.java | 0 .../metrics/MetricAggScriptPlugin.java | 0 .../metrics/MinAggregatorTests.java | 0 .../search/aggregations/metrics/MinIT.java | 0 .../search/aggregations/metrics/MinTests.java | 0 .../metrics/PercentileRanksTests.java | 0 .../metrics/PercentilesTests.java | 0 .../metrics/ScriptedMetricIT.java | 0 .../metrics/ScriptedMetricTests.java | 0 .../metrics/StatsAggregatorTests.java | 0 .../search/aggregations/metrics/StatsIT.java | 0 .../aggregations/metrics/StatsTests.java | 0 .../metrics/SumAggregatorTests.java | 0 .../search/aggregations/metrics/SumIT.java | 0 .../search/aggregations/metrics/SumTests.java | 0 .../metrics/TDigestPercentileRanksIT.java | 0 .../metrics/TDigestPercentilesIT.java | 0 .../aggregations/metrics/TopHitsIT.java | 0 .../aggregations/metrics/TopHitsTests.java | 0 .../aggregations/metrics/ValueCountIT.java | 0 .../aggregations/metrics/ValueCountTests.java | 0 .../metrics/avg/AvgAggregatorTests.java | 0 .../metrics/avg/InternalAvgTests.java | 0 .../metrics/cardinality/CardinalityTests.java | 0 .../cardinality/HyperLogLogPlusPlusTests.java | 0 .../cardinality/InternalCardinalityTests.java | 0 .../geobounds/GeoBoundsAggregatorTests.java | 0 .../geobounds/InternalGeoBoundsTests.java | 0 .../GeoCentroidAggregatorTests.java | 0 .../geocentroid/InternalGeoCentroidTests.java | 0 .../AbstractPercentilesTestCase.java | 0 .../InternalPercentilesRanksTestCase.java | 0 .../InternalPercentilesTestCase.java | 0 .../percentiles/PercentilesMethodTests.java | 0 .../HDRPercentileRanksAggregatorTests.java | 0 .../hdr/HDRPercentilesAggregatorTests.java | 0 .../hdr/InternalHDRPercentilesRanksTests.java | 0 .../hdr/InternalHDRPercentilesTests.java | 0 .../InternalTDigestPercentilesRanksTests.java | 0 .../InternalTDigestPercentilesTests.java | 0 ...TDigestPercentileRanksAggregatorTests.java | 0 .../TDigestPercentilesAggregatorTests.java | 0 .../scripted/InternalScriptedMetricTests.java | 0 .../ScriptedMetricAggregatorTests.java | 0 .../metrics/tophits/InternalTopHitsTests.java | 0 .../tophits/TopHitsAggregatorTests.java | 0 .../valuecount/InternalValueCountTests.java | 0 .../valuecount/ValueCountAggregatorTests.java | 0 .../aggregations/pipeline/AvgBucketIT.java | 0 .../aggregations/pipeline/BucketScriptIT.java | 0 .../pipeline/BucketScriptTests.java | 0 .../pipeline/BucketSelectorIT.java | 0 .../pipeline/BucketSelectorTests.java | 0 .../pipeline/CumulativeSumIT.java | 0 .../pipeline/CumulativeSumTests.java | 0 .../pipeline/DateDerivativeIT.java | 0 .../aggregations/pipeline/DerivativeIT.java | 0 .../pipeline/DerivativeTests.java | 0 .../pipeline/ExtendedStatsBucketIT.java | 0 .../pipeline/InternalSimpleValueTests.java | 0 .../aggregations/pipeline/MaxBucketIT.java | 0 .../aggregations/pipeline/MinBucketIT.java | 0 .../pipeline/PercentilesBucketIT.java | 0 .../PipelineAggregationHelperTests.java | 0 .../pipeline/SerialDifferenceTests.java | 0 .../aggregations/pipeline/StatsBucketIT.java | 0 .../aggregations/pipeline/SumBucketIT.java | 0 .../AbstractBucketMetricsTestCase.java | 0 .../bucketmetrics/AvgBucketTests.java | 0 .../ExtendedStatsBucketTests.java | 0 .../InternalBucketMetricValueTests.java | 0 .../bucketmetrics/MaxBucketTests.java | 0 .../bucketmetrics/MinBucketTests.java | 0 .../bucketmetrics/PercentilesBucketTests.java | 0 .../bucketmetrics/StatsBucketTests.java | 0 .../bucketmetrics/SumBucketTests.java | 0 .../InternalPercentilesBucketTests.java | 0 .../InternalExtendedStatsBucketTests.java | 0 .../pipeline/bucketsort/BucketSortIT.java | 0 .../pipeline/bucketsort/BucketSortTests.java | 0 .../derivative/InternalDerivativeTests.java | 0 .../pipeline/moving/avg/MovAvgIT.java | 0 .../pipeline/moving/avg/MovAvgTests.java | 0 .../pipeline/moving/avg/MovAvgUnitTests.java | 0 .../pipeline/serialdiff/SerialDiffIT.java | 0 .../support/IncludeExcludeTests.java | 0 .../support/MissingValuesTests.java | 0 .../aggregations/support/PathTests.java | 0 .../support/ScriptValuesTests.java | 0 .../aggregations/support/ValueTypeTests.java | 0 .../support/ValuesSourceConfigTests.java | 0 .../basic/SearchWhileCreatingIndexIT.java | 0 .../search/basic/SearchWhileRelocatingIT.java | 0 .../basic/SearchWithRandomExceptionsIT.java | 0 .../basic/SearchWithRandomIOExceptionsIT.java | 0 .../basic/TransportSearchFailuresIT.java | 0 .../basic/TransportTwoNodesSearchIT.java | 0 .../builder/SearchSourceBuilderTests.java | 0 .../search/child/ParentFieldLoadingIT.java | 0 .../search/collapse/CollapseBuilderTests.java | 0 .../search/fetch/FetchSubPhasePluginIT.java | 0 .../subphase/FetchSourceSubPhaseTests.java | 0 .../search/fetch/subphase/InnerHitsIT.java | 0 .../fetch/subphase/MatchedQueriesIT.java | 0 .../ParentFieldSubFetchPhaseTests.java | 0 .../subphase/highlight/CustomHighlighter.java | 0 .../highlight/CustomHighlighterPlugin.java | 0 .../highlight/CustomHighlighterSearchIT.java | 0 .../highlight/HighlightBuilderTests.java | 0 .../highlight/HighlightFieldTests.java | 0 .../highlight/HighlighterSearchIT.java | 0 .../highlight/PlainHighlighterTests.java | 0 .../search/fields/SearchFieldsIT.java | 0 .../functionscore/DecayFunctionScoreIT.java | 0 .../functionscore/ExplainableScriptIT.java | 0 .../FunctionScoreFieldValueIT.java | 0 .../search/functionscore/FunctionScoreIT.java | 0 .../functionscore/FunctionScorePluginIT.java | 0 .../search/functionscore/QueryRescorerIT.java | 0 .../functionscore/RandomScoreFunctionIT.java | 0 .../search/geo/GeoBoundingBoxIT.java | 0 .../search/geo/GeoDistanceIT.java | 0 .../elasticsearch/search/geo/GeoFilterIT.java | 0 .../search/geo/GeoPolygonIT.java | 0 .../search/geo/GeoShapeIntegrationIT.java | 0 .../search/geo/GeoShapeQueryTests.java | 0 .../search/internal/AliasFilterTests.java | 0 .../search/internal/ScrollContextTests.java | 0 .../ShardSearchTransportRequestTests.java | 0 .../search/morelikethis/MoreLikeThisIT.java | 0 .../search/msearch/MultiSearchIT.java | 0 .../search/nested/SimpleNestedIT.java | 0 .../search/preference/SearchPreferenceIT.java | 0 .../search/profile/ProfileResultTests.java | 0 .../SearchProfileShardResultsTests.java | 0 .../search/profile/TimerTests.java | 0 .../AggregationProfileShardResultTests.java | 0 .../aggregation/AggregationProfilerIT.java | 0 .../profile/query/CollectorResultTests.java | 0 .../query/QueryProfileShardResultTests.java | 0 .../search/profile/query/QueryProfilerIT.java | 0 .../profile/query/QueryProfilerTests.java | 0 .../profile/query/RandomQueryGenerator.java | 0 .../elasticsearch/search/query/ExistsIT.java | 0 .../search/query/MultiMatchQueryIT.java | 0 .../search/query/QueryPhaseTests.java | 0 .../search/query/QueryStringIT.java | 0 .../search/query/SearchQueryIT.java | 0 .../search/query/SimpleQueryStringIT.java | 0 .../search/rescore/QueryRescoreModeTests.java | 0 .../rescore/QueryRescorerBuilderTests.java | 0 .../scriptfilter/ScriptQuerySearchIT.java | 0 .../search/scroll/DuelScrollIT.java | 0 .../scroll/RestClearScrollActionTests.java | 0 .../scroll/RestSearchScrollActionTests.java | 0 .../search/scroll/SearchScrollIT.java | 0 .../SearchScrollWithFailingNodesIT.java | 0 .../searchafter/SearchAfterBuilderTests.java | 0 .../search/searchafter/SearchAfterIT.java | 0 .../search/simple/SimpleSearchIT.java | 0 .../slice/DocValuesSliceQueryTests.java | 0 .../search/slice/SearchSliceIT.java | 0 .../search/slice/SliceBuilderTests.java | 0 .../search/slice/TermsSliceQueryTests.java | 0 .../search/sort/AbstractSortTestCase.java | 0 .../search/sort/FieldSortBuilderTests.java | 0 .../search/sort/FieldSortIT.java | 0 .../search/sort/GeoDistanceIT.java | 0 .../search/sort/GeoDistanceSortBuilderIT.java | 0 .../sort/GeoDistanceSortBuilderTests.java | 0 .../search/sort/NestedSortBuilderTests.java | 0 .../search/sort/ScoreSortBuilderTests.java | 0 .../search/sort/ScriptSortBuilderTests.java | 0 .../search/sort/SimpleSortIT.java | 0 .../search/sort/SortBuilderTests.java | 0 .../search/sort/SortModeTests.java | 0 .../search/sort/SortOrderTests.java | 0 .../search/source/MetadataFetchingIT.java | 0 .../search/source/SourceFetchingIT.java | 0 .../search/stats/SearchStatsIT.java | 0 .../search/stats/SearchStatsUnitTests.java | 0 .../AbstractSuggestionBuilderTestCase.java | 0 .../suggest/CompletionSuggestSearchIT.java | 0 .../CompletionSuggestionOptionTests.java | 0 .../ContextCompletionSuggestSearchIT.java | 0 .../search/suggest/CustomSuggester.java | 0 .../suggest/CustomSuggesterSearchIT.java | 0 .../search/suggest/SuggestBuilderTests.java | 0 .../search/suggest/SuggestSearchIT.java | 0 .../search/suggest/SuggestTests.java | 0 .../search/suggest/SuggestionEntryTests.java | 0 .../search/suggest/SuggestionOptionTests.java | 0 .../search/suggest/SuggestionTests.java | 0 .../suggest/TermSuggestionOptionTests.java | 0 .../CategoryContextMappingTests.java | 0 .../completion/CategoryQueryContextTests.java | 0 .../CompletionSuggesterBuilderTests.java | 0 .../completion/CompletionSuggestionTests.java | 0 .../suggest/completion/FuzzyOptionsTests.java | 0 .../completion/GeoContextMappingTests.java | 0 .../completion/GeoQueryContextTests.java | 0 .../completion/QueryContextTestCase.java | 0 .../suggest/completion/RegexOptionsTests.java | 0 .../phrase/DirectCandidateGeneratorTests.java | 0 .../suggest/phrase/LaplaceModelTests.java | 0 .../phrase/LinearInterpolationModelTests.java | 0 .../phrase/NoisyChannelSpellCheckerTests.java | 0 .../phrase/PhraseSuggestionBuilderTests.java | 0 .../phrase/SmoothingModelTestCase.java | 0 .../phrase/StupidBackoffModelTests.java | 0 .../search/suggest/term/SortByTests.java | 0 .../suggest/term/StringDistanceImplTests.java | 0 .../search/suggest/term/SuggestModeTests.java | 0 .../term/TermSuggestionBuilderTests.java | 0 .../similarity/SimilarityIT.java | 0 .../AbstractSnapshotIntegTestCase.java | 0 .../snapshots/BlobStoreFormatIT.java | 0 .../DedicatedClusterSnapshotRestoreIT.java | 0 .../snapshots/FsBlobStoreRepositoryIT.java | 0 .../MinThreadsSnapshotRestoreIT.java | 0 .../snapshots/RepositoriesIT.java | 0 ...epositoriesMetaDataSerializationTests.java | 0 .../SharedClusterSnapshotRestoreIT.java | 0 .../snapshots/SnapshotRequestsTests.java | 0 .../snapshots/SnapshotShardsServiceIT.java | 0 .../snapshots/SnapshotTests.java | 0 .../snapshots/SnapshotUtilsTests.java | 0 ...SnapshotsInProgressSerializationTests.java | 0 .../mockstore/BlobContainerWrapper.java | 0 .../snapshots/mockstore/BlobStoreWrapper.java | 0 .../snapshots/mockstore/MockRepository.java | 0 .../tasks/ListTasksResponseTests.java | 0 .../org/elasticsearch/tasks/TaskIdTests.java | 0 .../elasticsearch/tasks/TaskResultTests.java | 0 .../org/elasticsearch/test/NoopDiscovery.java | 0 .../test/geo/RandomGeoGenerator.java | 0 .../test/geo/RandomShapeGenerator.java | 0 .../test/hamcrest/DoubleMatcher.java | 0 .../hamcrest/ElasticsearchGeoAssertions.java | 0 .../SharedSignificantTermsTestMethods.java | 0 ...utoQueueAdjustingExecutorBuilderTests.java | 0 .../threadpool/ESThreadPoolTestCase.java | 0 .../threadpool/FixedThreadPoolTests.java | 0 .../threadpool/ScalingThreadPoolTests.java | 0 .../ScheduleWithFixedDelayTests.java | 0 .../threadpool/SimpleThreadPoolIT.java | 0 .../ThreadPoolSerializationTests.java | 0 .../threadpool/ThreadPoolStatsTests.java | 0 .../threadpool/ThreadPoolTests.java | 0 .../UpdateThreadPoolSettingsTests.java | 0 .../transport/ActionNamesIT.java | 0 .../CompressibleBytesOutputStreamTests.java | 0 .../transport/ConnectionProfileTests.java | 0 .../transport/PublishPortTests.java | 0 .../RemoteClusterConnectionTests.java | 0 .../transport/RemoteClusterServiceTests.java | 0 .../transport/TcpTransportTests.java | 0 .../transport/TransportActionProxyTests.java | 0 .../TransportServiceHandshakeTests.java | 0 .../org/elasticsearch/update/UpdateIT.java | 0 .../elasticsearch/update/UpdateNoopIT.java | 0 .../usage/UsageServiceTests.java | 0 .../validate/SimpleValidateQueryIT.java | 0 .../ConcurrentDocumentOperationIT.java | 0 .../versioning/SimpleVersioningIT.java | 0 .../watcher/FileWatcherTests.java | 0 .../watcher/ResourceWatcherServiceTests.java | 0 ...icsearch.plugins.spi.NamedXContentProvider | 0 .../test/resources/config/elasticsearch.json | 0 .../test/resources/config/elasticsearch.yml | 0 .../test/resources/config/garbage/garbage.yml | 0 .../analyze/conf_dir/hunspell/en_US/en_US.aff | 0 .../analyze/conf_dir/hunspell/en_US/en_US.dic | 0 .../conf_dir/hunspell/en_US_custom/en_US.aff | 0 .../conf_dir/hunspell/en_US_custom/en_US.dic | 0 .../hunspell/en_US_custom/settings.yml | 0 .../no_aff_conf_dir/hunspell/en_US/en_US.dic | 0 .../two_aff_conf_dir/hunspell/en_US/en_AU.aff | 0 .../two_aff_conf_dir/hunspell/en_US/en_US.aff | 0 .../two_aff_conf_dir/hunspell/en_US/en_US.dic | 0 .../indices/bwc/compressed-repo-1.7.4.zip | Bin .../indices/bwc/unsupported-0.20.6.zip | Bin .../indices/bwc/unsupported-0.90.0.Beta1.zip | Bin .../indices/bwc/unsupported-0.90.0.RC1.zip | Bin .../indices/bwc/unsupported-0.90.0.RC2.zip | Bin .../indices/bwc/unsupported-0.90.0.zip | Bin .../indices/bwc/unsupported-0.90.1.zip | Bin .../indices/bwc/unsupported-0.90.10.zip | Bin .../indices/bwc/unsupported-0.90.11.zip | Bin .../indices/bwc/unsupported-0.90.12.zip | Bin .../indices/bwc/unsupported-0.90.13.zip | Bin .../indices/bwc/unsupported-0.90.2.zip | Bin .../indices/bwc/unsupported-0.90.3.zip | Bin .../indices/bwc/unsupported-0.90.4.zip | Bin .../indices/bwc/unsupported-0.90.5.zip | Bin .../indices/bwc/unsupported-0.90.6.zip | Bin .../indices/bwc/unsupported-0.90.7.zip | Bin .../indices/bwc/unsupported-0.90.8.zip | Bin .../indices/bwc/unsupported-0.90.9.zip | Bin .../indices/bwc/unsupported-1.0.0.Beta1.zip | Bin .../indices/bwc/unsupported-1.0.0.Beta2.zip | Bin .../indices/bwc/unsupported-1.0.0.RC1.zip | Bin .../indices/bwc/unsupported-1.0.0.RC2.zip | Bin .../indices/bwc/unsupported-1.0.0.zip | Bin .../indices/bwc/unsupported-1.0.1.zip | Bin .../indices/bwc/unsupported-1.0.2.zip | Bin .../indices/bwc/unsupported-1.0.3.zip | Bin .../indices/bwc/unsupported-1.1.0.zip | Bin .../indices/bwc/unsupported-1.1.1.zip | Bin .../indices/bwc/unsupported-1.1.2.zip | Bin .../indices/bwc/unsupported-1.2.0.zip | Bin .../indices/bwc/unsupported-1.2.1.zip | Bin .../indices/bwc/unsupported-1.2.2.zip | Bin .../indices/bwc/unsupported-1.2.3.zip | Bin .../indices/bwc/unsupported-1.2.4.zip | Bin .../indices/bwc/unsupported-1.3.0.zip | Bin .../indices/bwc/unsupported-1.3.1.zip | Bin .../indices/bwc/unsupported-1.3.2.zip | Bin .../indices/bwc/unsupported-1.3.3.zip | Bin .../indices/bwc/unsupported-1.3.4.zip | Bin .../indices/bwc/unsupported-1.3.5.zip | Bin .../indices/bwc/unsupported-1.3.6.zip | Bin .../indices/bwc/unsupported-1.3.7.zip | Bin .../indices/bwc/unsupported-1.3.8.zip | Bin .../indices/bwc/unsupported-1.3.9.zip | Bin .../indices/bwc/unsupported-1.4.0.Beta1.zip | Bin .../indices/bwc/unsupported-1.4.0.zip | Bin .../indices/bwc/unsupported-1.4.1.zip | Bin .../indices/bwc/unsupported-1.4.2.zip | Bin .../indices/bwc/unsupported-1.4.3.zip | Bin .../indices/bwc/unsupported-1.4.4.zip | Bin .../indices/bwc/unsupported-1.4.5.zip | Bin .../indices/bwc/unsupported-1.5.0.zip | Bin .../indices/bwc/unsupported-1.5.1.zip | Bin .../indices/bwc/unsupported-1.5.2.zip | Bin .../indices/bwc/unsupported-1.6.0.zip | Bin .../indices/bwc/unsupported-1.6.1.zip | Bin .../indices/bwc/unsupported-1.6.2.zip | Bin .../indices/bwc/unsupported-1.7.0.zip | Bin .../indices/bwc/unsupported-1.7.1.zip | Bin .../indices/bwc/unsupported-1.7.2.zip | Bin .../indices/bwc/unsupported-1.7.3.zip | Bin .../indices/bwc/unsupported-1.7.4.zip | Bin .../indices/bwc/unsupported-1.7.5.zip | Bin .../indices/bwc/unsupported-2.0.0-beta1.zip | Bin .../indices/bwc/unsupported-2.0.0-beta2.zip | Bin .../indices/bwc/unsupported-2.0.0-rc1.zip | Bin .../indices/bwc/unsupported-2.0.0.zip | Bin .../indices/bwc/unsupported-2.0.1.zip | Bin .../indices/bwc/unsupported-2.0.2.zip | Bin .../indices/bwc/unsupported-2.1.0.zip | Bin .../indices/bwc/unsupported-2.1.1.zip | Bin .../indices/bwc/unsupported-2.1.2.zip | Bin .../indices/bwc/unsupported-2.2.0.zip | Bin .../indices/bwc/unsupported-2.2.1.zip | Bin .../indices/bwc/unsupported-2.2.2.zip | Bin .../indices/bwc/unsupported-2.3.0.zip | Bin .../indices/bwc/unsupported-2.3.1.zip | Bin .../indices/bwc/unsupported-2.3.2.zip | Bin .../indices/bwc/unsupported-2.3.3.zip | Bin .../indices/bwc/unsupported-2.3.4.zip | Bin .../indices/bwc/unsupported-2.3.5.zip | Bin .../indices/bwc/unsupported-2.4.0.zip | Bin .../indices/bwc/unsupported-2.4.1.zip | Bin .../indices/bwc/unsupported-2.4.2.zip | Bin .../indices/bwc/unsupported-2.4.3.zip | Bin .../indices/bwc/unsupported-2.4.5.zip | Bin .../indices/bwc/unsupportedrepo-0.20.6.zip | Bin .../bwc/unsupportedrepo-1.0.0.Beta2.zip | Bin .../indices/bwc/unsupportedrepo-1.0.0.RC1.zip | Bin .../indices/bwc/unsupportedrepo-1.0.0.RC2.zip | Bin .../indices/bwc/unsupportedrepo-1.0.0.zip | Bin .../indices/bwc/unsupportedrepo-1.0.1.zip | Bin .../indices/bwc/unsupportedrepo-1.0.2.zip | Bin .../indices/bwc/unsupportedrepo-1.0.3.zip | Bin .../indices/bwc/unsupportedrepo-1.1.0.zip | Bin .../indices/bwc/unsupportedrepo-1.1.1.zip | Bin .../indices/bwc/unsupportedrepo-1.1.2.zip | Bin .../indices/bwc/unsupportedrepo-1.2.0.zip | Bin .../indices/bwc/unsupportedrepo-1.2.1.zip | Bin .../indices/bwc/unsupportedrepo-1.2.2.zip | Bin .../indices/bwc/unsupportedrepo-1.2.3.zip | Bin .../indices/bwc/unsupportedrepo-1.2.4.zip | Bin .../indices/bwc/unsupportedrepo-1.3.0.zip | Bin .../indices/bwc/unsupportedrepo-1.3.1.zip | Bin .../indices/bwc/unsupportedrepo-1.3.2.zip | Bin .../indices/bwc/unsupportedrepo-1.3.3.zip | Bin .../indices/bwc/unsupportedrepo-1.3.4.zip | Bin .../indices/bwc/unsupportedrepo-1.3.5.zip | Bin .../indices/bwc/unsupportedrepo-1.3.6.zip | Bin .../indices/bwc/unsupportedrepo-1.3.7.zip | Bin .../indices/bwc/unsupportedrepo-1.3.8.zip | Bin .../indices/bwc/unsupportedrepo-1.3.9.zip | Bin .../bwc/unsupportedrepo-1.4.0.Beta1.zip | Bin .../indices/bwc/unsupportedrepo-1.4.0.zip | Bin .../indices/bwc/unsupportedrepo-1.4.1.zip | Bin .../indices/bwc/unsupportedrepo-1.4.2.zip | Bin .../indices/bwc/unsupportedrepo-1.4.3.zip | Bin .../indices/bwc/unsupportedrepo-1.4.4.zip | Bin .../indices/bwc/unsupportedrepo-1.4.5.zip | Bin .../indices/bwc/unsupportedrepo-1.5.0.zip | Bin .../indices/bwc/unsupportedrepo-1.5.1.zip | Bin .../indices/bwc/unsupportedrepo-1.5.2.zip | Bin .../indices/bwc/unsupportedrepo-1.6.0.zip | Bin .../indices/bwc/unsupportedrepo-1.6.1.zip | Bin .../indices/bwc/unsupportedrepo-1.6.2.zip | Bin .../indices/bwc/unsupportedrepo-1.7.0.zip | Bin .../indices/bwc/unsupportedrepo-1.7.1.zip | Bin .../indices/bwc/unsupportedrepo-1.7.2.zip | Bin .../indices/bwc/unsupportedrepo-1.7.3.zip | Bin .../indices/bwc/unsupportedrepo-1.7.4.zip | Bin .../indices/bwc/unsupportedrepo-1.7.5.zip | Bin .../bwc/unsupportedrepo-2.0.0-beta1.zip | Bin .../bwc/unsupportedrepo-2.0.0-beta2.zip | Bin .../indices/bwc/unsupportedrepo-2.0.0-rc1.zip | Bin .../indices/bwc/unsupportedrepo-2.0.0.zip | Bin .../indices/bwc/unsupportedrepo-2.0.1.zip | Bin .../indices/bwc/unsupportedrepo-2.0.2.zip | Bin .../indices/bwc/unsupportedrepo-2.1.0.zip | Bin .../indices/bwc/unsupportedrepo-2.1.1.zip | Bin .../indices/bwc/unsupportedrepo-2.1.2.zip | Bin .../indices/bwc/unsupportedrepo-2.2.0.zip | Bin .../indices/bwc/unsupportedrepo-2.2.1.zip | Bin .../indices/bwc/unsupportedrepo-2.2.2.zip | Bin .../indices/bwc/unsupportedrepo-2.3.0.zip | Bin .../indices/bwc/unsupportedrepo-2.3.1.zip | Bin .../indices/bwc/unsupportedrepo-2.3.2.zip | Bin .../indices/bwc/unsupportedrepo-2.3.3.zip | Bin .../indices/bwc/unsupportedrepo-2.3.4.zip | Bin .../indices/bwc/unsupportedrepo-2.3.5.zip | Bin .../indices/bwc/unsupportedrepo-2.4.0.zip | Bin .../indices/bwc/unsupportedrepo-2.4.1.zip | Bin .../indices/bwc/unsupportedrepo-2.4.2.zip | Bin .../indices/bwc/unsupportedrepo-2.4.3.zip | Bin .../indices/bwc/unsupportedrepo-2.4.5.zip | Bin .../elasticsearch/action/bulk/bulk-log.json | 0 .../action/bulk/simple-bulk.json | 0 .../action/bulk/simple-bulk10.json | 0 .../action/bulk/simple-bulk11.json | 0 .../action/bulk/simple-bulk2.json | 0 .../action/bulk/simple-bulk3.json | 0 .../action/bulk/simple-bulk4.json | 0 .../action/bulk/simple-bulk5.json | 0 .../action/bulk/simple-bulk6.json | 0 .../action/bulk/simple-bulk7.json | 0 .../action/bulk/simple-bulk8.json | 0 .../action/bulk/simple-bulk9.json | 0 .../fieldstats-index-constraints-request.json | 0 .../action/search/simple-msearch1.json | 0 .../action/search/simple-msearch2.json | 0 .../action/search/simple-msearch3.json | 0 .../action/search/simple-msearch4.json | 0 .../action/search/simple-msearch5.json | 0 .../action/termvectors/multiRequest1.json | 0 .../action/termvectors/multiRequest2.json | 0 .../action/termvectors/multiRequest3.json | 0 .../bootstrap/duplicate-classes.jar | Bin .../bootstrap/duplicate-xmlbeans-classes.jar | Bin .../cluster/routing/issue_9023.zip | Bin .../settings/loader/indentation-settings.yml | 0 ...-with-explicit-document-start-settings.yml | 0 .../common/settings/loader/test-settings.json | 0 .../common/settings/loader/test-settings.yml | 0 .../org/elasticsearch/gateway/global-3.st | Bin .../index/analysis/shingle_analysis.json | 0 .../elasticsearch/index/analysis/stop.json | 0 .../index/analysis/synonyms/synonyms.json | 0 .../index/analysis/synonyms/synonyms.txt | 0 .../analysis/synonyms/synonyms_wordnet.txt | 0 .../elasticsearch/index/analysis/test1.json | 0 .../elasticsearch/index/analysis/test1.yml | 0 .../genericstore/test-data.json | 0 .../genericstore/test-mapping.json | 0 .../dynamictemplate/pathmatch/test-data.json | 0 .../pathmatch/test-mapping.json | 0 .../dynamictemplate/simple/test-data.json | 0 .../dynamictemplate/simple/test-mapping.json | 0 .../mapper/multifield/merge/test-data.json | 0 .../multifield/merge/test-mapping1.json | 0 .../multifield/merge/test-mapping2.json | 0 .../multifield/merge/test-mapping3.json | 0 .../multifield/merge/test-mapping4.json | 0 .../mapper/multifield/merge/upgrade1.json | 0 .../mapper/multifield/merge/upgrade2.json | 0 .../mapper/multifield/merge/upgrade3.json | 0 .../index/mapper/multifield/test-data.json | 0 .../mapper/multifield/test-multi-fields.json | 0 .../index/mapper/path/test-mapping.json | 0 .../index/mapper/simple/test-mapping.json | 0 .../mapper/simple/test1-notype-noid.json | 0 .../index/mapper/simple/test1.json | 0 .../index/query/commonTerms-query1.json | 0 .../index/query/commonTerms-query2.json | 0 .../index/query/commonTerms-query3.json | 0 .../index/query/geo_polygon_exception_1.json | 0 .../index/query/geo_polygon_exception_2.json | 0 .../index/query/geo_polygon_exception_3.json | 0 .../index/query/geo_polygon_exception_4.json | 0 .../index/query/geo_polygon_exception_5.json | 0 .../translog-invalid-first-byte.binary | Bin .../index/translog/translog-v0.binary | Bin .../translog-v1-corrupted-body.binary | Bin .../translog-v1-corrupted-magic.binary | Bin .../translog/translog-v1-truncated.binary | Bin .../index/translog/translog-v1.binary | Bin .../elasticsearch/plugins/dummy-plugin.jar | Bin .../plugins/non-extensible-plugin.jar | Bin .../elasticsearch/search/geo/gzippedmap.gz | Bin .../search/query/all-example-document.json | 0 .../query/all-query-index-with-all.json | 0 .../search/query/all-query-index.json | 0 settings.gradle | 16 +- 4655 files changed, 744 insertions(+), 744 deletions(-) rename buildSrc/src/main/resources/forbidden/{es-core-signatures.txt => es-server-signatures.txt} (100%) rename {core => server}/build.gradle (98%) rename {core => server}/cli/build.gradle (95%) rename {core => server}/cli/licenses/jopt-simple-5.0.2.jar.sha1 (100%) rename {core => server}/cli/licenses/jopt-simple-LICENSE.txt (100%) rename {core => server}/cli/licenses/jopt-simple-NOTICE.txt (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/Command.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/Terminal.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/UserException.java (100%) rename {core => server}/licenses/HdrHistogram-2.1.9.jar.sha1 (100%) rename {core => server}/licenses/HdrHistogram-LICENSE.txt (100%) rename {core => server}/licenses/HdrHistogram-NOTICE.txt (100%) rename {core => server}/licenses/apache-log4j-extras-DEPENDENCIES (100%) rename {core => server}/licenses/hppc-0.7.1.jar.sha1 (100%) rename {core => server}/licenses/hppc-LICENSE.txt (100%) rename {core => server}/licenses/hppc-NOTICE.txt (100%) rename {core => server}/licenses/jackson-LICENSE (100%) rename {core => server}/licenses/jackson-NOTICE (100%) rename {core => server}/licenses/jackson-core-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jna-4.5.1.jar.sha1 (100%) rename {core => server}/licenses/jna-LICENSE.txt (100%) rename {core => server}/licenses/jna-NOTICE.txt (100%) rename {core => server}/licenses/joda-time-2.9.5.jar.sha1 (100%) rename {core => server}/licenses/joda-time-LICENSE.txt (100%) rename {core => server}/licenses/joda-time-NOTICE.txt (100%) rename {core => server}/licenses/jts-1.13.jar.sha1 (100%) rename {core => server}/licenses/jts-LICENSE.txt (100%) rename {core => server}/licenses/jts-NOTICE.txt (100%) rename {core => server}/licenses/log4j-1.2-api-2.9.1.jar.sha1 (100%) rename {core => server}/licenses/log4j-LICENSE.txt (100%) rename {core => server}/licenses/log4j-NOTICE.txt (100%) rename {core => server}/licenses/log4j-api-2.9.1.jar.sha1 (100%) rename {core => server}/licenses/log4j-api-LICENSE.txt (100%) rename {core => server}/licenses/log4j-api-NOTICE.txt (100%) rename {core => server}/licenses/log4j-core-2.9.1.jar.sha1 (100%) rename {core => server}/licenses/log4j-core-LICENSE.txt (100%) rename {core => server}/licenses/log4j-core-NOTICE.txt (100%) rename {core => server}/licenses/lucene-LICENSE.txt (100%) rename {core => server}/licenses/lucene-NOTICE.txt (100%) rename {core => server}/licenses/lucene-analyzers-common-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-backward-codecs-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-core-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-grouping-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-highlighter-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-join-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-memory-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-misc-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-queries-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-queryparser-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-sandbox-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-spatial-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-spatial-extras-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-spatial3d-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-suggest-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/securesm-1.2.jar.sha1 (100%) rename {core => server}/licenses/securesm-LICENSE.txt (100%) rename {core => server}/licenses/securesm-NOTICE.txt (100%) rename {core => server}/licenses/snakeyaml-1.17.jar.sha1 (100%) rename {core => server}/licenses/snakeyaml-LICENSE.txt (100%) rename {core => server}/licenses/snakeyaml-NOTICE.txt (100%) rename {core => server}/licenses/spatial4j-0.6.jar.sha1 (100%) rename {core => server}/licenses/spatial4j-ABOUT.txt (100%) rename {core => server}/licenses/spatial4j-LICENSE.txt (100%) rename {core => server}/licenses/spatial4j-NOTICE.txt (100%) rename {core => server}/licenses/t-digest-3.0.jar.sha1 (100%) rename {core => server}/licenses/t-digest-LICENSE.txt (100%) rename {core => server}/licenses/t-digest-NOTICE.txt (100%) rename {core => server}/src/main/eclipse-build.gradle (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java (100%) rename {core => server}/src/main/java/org/apache/lucene/document/BinaryRange.java (100%) rename {core => server}/src/main/java/org/apache/lucene/index/OneMergeHelper.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/MinDocQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/Assertions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/Build.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchParseException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchStatusException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ExceptionsHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ResourceNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/SpecialPermission.java (100%) rename {core => server}/src/main/java/org/elasticsearch/Version.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/Action.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/AliasesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/DocWriteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/DocWriteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/FailedNodeException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/GenericAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/IndicesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/LatchedActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ListenableActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/NoSuchNodeException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/NotifyOnceListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/OriginalIndices.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/RealtimeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/RoutingMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/TaskOperationFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ThreadingModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/TimestampParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/UnavailableShardsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ValidateActions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/Retry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/TransportGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/TransportMainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/CountedCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchTransportService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActionFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActionFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/IndicesOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/TransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/TransportActions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/WriteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/WriteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JNANatives.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JarHell.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Natives.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Security.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Spawner.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/StartupException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/AdminClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/Client.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/ClusterAdminClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/ElasticsearchClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/FilterClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/IndicesAdminClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/Requests.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/node/NodeClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/support/AbstractClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/TransportClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterName.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/Diff.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/Diffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/DiffableUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/DiskUsage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NamedDiff.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NamedDiffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NotMasterException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/Preference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/ClusterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/MasterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Booleans.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedConsumer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedSupplier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Classes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Explicit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/FieldMemoryStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/MacAddressProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/NamedRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Nullable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Numbers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ParseField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/PidFile.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Priority.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Randomness.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/SecureRandomHolder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/StopWatch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Strings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/SuppressForbidden.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Table.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/TriFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/UUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/UUIDs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/BytesArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/BytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/Cache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/CacheLoader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/RemovalListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/HppcMaps.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/Iterators.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/MapBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/Tuple.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/AbstractComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/Lifecycle.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/LifecycleListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/Compressor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/NotXContentException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/document/DocumentField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoDistance.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoPoint.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/hash/MessageDigests.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/AbstractModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Binder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Binding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/CreationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Exposed.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Guice.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InheritingState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Initializable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Initializables.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Initializer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Inject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Injector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectorShell.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Key.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Lookups.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MembersInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Module.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PrivateModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Provider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Provides.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ProvisionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Reflection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Scope.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Scopes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Singleton.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Stage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/State.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Errors.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Join.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Strings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/Named.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/Names.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Element.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Elements.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Message.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/Modules.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/Providers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/Types.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/Channels.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FastStringReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/PathUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/Streams.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/Streamable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/Writeable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/joda/DateMathParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/joda/Joda.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lease/Releasable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lease/Releasables.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/Loggers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/Lucene.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/all/AllField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/Queries.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/metrics/Metric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/Cidrs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/IfConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/InetAddresses.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkAddress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/path/PathTrie.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/Recycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/Recyclers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/regex/Regex.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/rounding/Rounding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SecureSetting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SecureSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SecureString.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/Setting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/Settings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SettingsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SettingsModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/text/Text.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/PortsRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/TransportAddress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/Fuzziness.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/RatioValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/SizeUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/SizeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/TimeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractHash.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ArrayUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigArrays.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigByteArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigFloatArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigIntArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigLongArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigObjectArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ByteArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ByteUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BytesRefHash.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/CancellableThreads.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/CollectionUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/Comparators.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/DoubleArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/FloatArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/IntArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LocaleUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LongArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LongHash.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ObjectArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/URIPattern.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/set/Sets.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/Discovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/ESFileStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/Environment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/NodeEnvironment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/NodeMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/ShardLock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/CorruptStateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/Gateway.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/MetaStateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/PriorityComparator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/BindHttpException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpServerTransport.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpTransportSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/Index.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexSortConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexWarmer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexingSlowLog.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/MergePolicyConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/SearchSlowLog.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/SlowLogLevel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/VersionType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/Analysis.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/IndexCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/codec/CodecService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/CommitStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/Engine.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/InternalEngine.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/Segment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/VersionValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/FieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/flush/FlushStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/get/GetResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/get/GetStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/get/ShardGetService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ContentPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/Mapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/Mapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ParseContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/Uid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/merge/MergeStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoExecType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/Operator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ParsedQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryShardContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryShardException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/RegexpFlag.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/Rewriteable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/support/NestedScope.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/MatchQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/NestedHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/DocsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexingStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/DirectoryService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/IndexStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/Store.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/StoreStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/Checkpoint.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/Translog.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexClosedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexCreationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/TermsLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/TypeMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/store/IndicesStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestDocument.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestMetadata.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/Pipeline.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/PipelineStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/Processor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/ValueSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/MonitorService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/Probes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/fs/FsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsProbe.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/Node.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/NodeClosedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/NodeService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/NodeValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/ResponseCollectorService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ActionPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/IngestPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/MapperPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/Platforms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/Plugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginSecurity.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/SearchPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/spi/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/IndexId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoriesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/Repository.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/VerificationFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/BaseRestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/BytesRestResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/MethodHandlers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestActions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestMainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ClassPermission.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ExecutableScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/FilterScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/GeneralScriptException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScoreAccessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/Script.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptEngine.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptMetrics.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/SearchScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/SimilarityScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/StoredScriptSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/TemplateScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/DefaultSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/DocValueFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/MultiValueMode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/Scroll.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchContextException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchContextMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchExtBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchHit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchParseException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchPhaseResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchShardTarget.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchSortValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/AliasFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ScrollContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/SearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/DocLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/ProfileResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/Profilers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/Timer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/CancellableCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QueryPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/Rescorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/SliceQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortMode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortOrder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SortBy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/Suggest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/Suggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/RestoreService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/Snapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/CancellableTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/Task.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskManager.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskResultsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/Scheduler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ThreadPool.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ActionTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/BindTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ConnectTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ConnectionProfile.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteClusterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpHeader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpTransport.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/Transport.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportActionProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportInterceptor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportMessage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportSerializationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/Transports.java (100%) rename {core => server}/src/main/java/org/elasticsearch/usage/UsageService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/FileChangesListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/FileWatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/WatcherHandle.java (100%) rename {core => server}/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java (100%) rename {core => server}/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec (100%) rename {core => server}/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (100%) rename {core => server}/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (100%) rename {core => server}/src/main/resources/config/favicon.ico (100%) rename {core => server}/src/main/resources/org/elasticsearch/bootstrap/security.policy (100%) rename {core => server}/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy (100%) rename {core => server}/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy (100%) rename {core => server}/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json (100%) rename {core => server}/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json (100%) rename {core => server}/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json (100%) rename {core => server}/src/test/eclipse-build.gradle (81%) rename {core => server}/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/QueriesTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/BuildTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ExceptionSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/SpecialPermissionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/VersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ActionListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ActionModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ExplainRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/IndicesRequestIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ListenerActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/RejectionActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/RetryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/get/GetResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/main/MainActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/main/MainResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cli/CommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cli/MultiCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cli/TerminalTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/node/NodeClientIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ack/AckIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/BooleansTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ChannelsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/NumbersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ParseFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/PidFileTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/PriorityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ReleasablesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/StringsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/TableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/UUIDTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/cache/CacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/StreamsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/joda/JodaTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/CidrsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/path/PathTrieTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/regex/RegexTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/BigArraysTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/LongHashTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/URIPatternTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/set/SetsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/document/DocumentActionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/document/ShardInfoIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/env/ESFileStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/env/EnvironmentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/explain/ExplainActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java (100%) rename {core => server}/src/test/java/org/elasticsearch/get/GetActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/SettingsListenerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/VersionTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/codec/CodecTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/SegmentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/get/GetResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/AllFieldIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/AllFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldIncludeInAllMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UidTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/package-info.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/OperatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RewriteableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/EngineAccess.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/StoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TestTranslog.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TranslogTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indexing/IndexActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/TermsLookupTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/flush/FlushIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestClientIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/NodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/PluginsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/RelocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/IndexIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ClassPermissionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/StoredScriptTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/StoredScriptsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/DocValueFormatTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/MultiValueModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/NestedIdentityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchCancellationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchCancellationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchHitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchHitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/TimerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/ExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/QueryStringIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SortModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/similarity/SimilarityIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java (100%) rename {core => server}/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/tasks/TaskIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/tasks/TaskResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/NoopDiscovery.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/ActionNamesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/PublishPortTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/TcpTransportTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/update/UpdateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/update/UpdateNoopIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/usage/UsageServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java (100%) rename {core => server}/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider (100%) rename {core => server}/src/test/resources/config/elasticsearch.json (100%) rename {core => server}/src/test/resources/config/elasticsearch.yml (100%) rename {core => server}/src/test/resources/config/garbage/garbage.yml (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml (100%) rename {core => server}/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic (100%) rename {core => server}/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff (100%) rename {core => server}/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff (100%) rename {core => server}/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic (100%) rename {core => server}/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.20.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.10.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.11.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.12.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.13.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.7.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.8.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.9.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.7.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.8.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.9.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.5.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.5.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.5.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.6.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.6.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.6.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/gateway/global-3.st (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/stop.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/test1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/test1.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/query/all-example-document.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/query/all-query-index-with-all.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/query/all-query-index.json (100%) diff --git a/build.gradle b/build.gradle index 7a2446d829bbc..c4ef2b3588029 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ configure(subprojects.findAll { it.projectDir.toPath().startsWith(rootPath) }) { * backwards compatibility guarantees and only keeping the latest beta or rc * in a branch if there are only betas and rcs in the branch so we have * *something* to test against. */ -VersionCollection versions = new VersionCollection(file('core/src/main/java/org/elasticsearch/Version.java').readLines('UTF-8')) +VersionCollection versions = new VersionCollection(file('server/src/main/java/org/elasticsearch/Version.java').readLines('UTF-8')) if (versions.currentVersion.toString() != VersionProperties.elasticsearch) { throw new GradleException("The last version in Versions.java [${versions.currentVersion}] does not match " + "VersionProperties.elasticsearch [${VersionProperties.elasticsearch}]") @@ -181,8 +181,8 @@ subprojects { ext.projectSubstitutions = [ "org.elasticsearch.gradle:build-tools:${version}": ':build-tools', "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec', - "org.elasticsearch:elasticsearch:${version}": ':core', - "org.elasticsearch:elasticsearch-cli:${version}": ':core:cli', + "org.elasticsearch:elasticsearch:${version}": ':server', + "org.elasticsearch:elasticsearch-cli:${version}": ':server:cli', "org.elasticsearch.client:elasticsearch-rest-client:${version}": ':client:rest', "org.elasticsearch.client:elasticsearch-rest-client-sniffer:${version}": ':client:sniffer', "org.elasticsearch.client:elasticsearch-rest-high-level-client:${version}": ':client:rest-high-level', @@ -226,7 +226,7 @@ subprojects { // Handle javadoc dependencies across projects. Order matters: the linksOffline for // org.elasticsearch:elasticsearch must be the last one or all the links for the - // other packages (e.g org.elasticsearch.client) will point to core rather than + // other packages (e.g org.elasticsearch.client) will point to server rather than // their own artifacts. if (project.plugins.hasPlugin(BuildPlugin)) { String artifactsHost = VersionProperties.elasticsearch.endsWith("-SNAPSHOT") ? "https://snapshots.elastic.co" : "https://artifacts.elastic.co" @@ -254,7 +254,7 @@ subprojects { gradle.projectsEvaluated { allprojects { if (project.path == ':test:framework') { - // :test:framework:test cannot run before and after :core:test + // :test:framework:test cannot run before and after :server:test return } configurations.all { diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy index f7b30e774e340..c836f0bbcb167 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy @@ -84,7 +84,7 @@ class PrecommitTasks { Task mainForbidden = project.tasks.findByName('forbiddenApisMain') if (mainForbidden != null) { mainForbidden.configure { - signaturesURLs += getClass().getResource('/forbidden/es-core-signatures.txt') + signaturesURLs += getClass().getResource('/forbidden/es-server-signatures.txt') } } Task testForbidden = project.tasks.findByName('forbiddenApisTest') diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index 03e9b1a3cc5dc..9d2a29de81136 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -11,719 +11,719 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildSrc/src/main/resources/forbidden/es-core-signatures.txt b/buildSrc/src/main/resources/forbidden/es-server-signatures.txt similarity index 100% rename from buildSrc/src/main/resources/forbidden/es-core-signatures.txt rename to buildSrc/src/main/resources/forbidden/es-server-signatures.txt diff --git a/buildSrc/version.properties b/buildSrc/version.properties index c923f4dba794f..32d1c8a044321 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -17,15 +17,15 @@ jna = 4.5.1 randomizedrunner = 2.5.2 junit = 4.12 httpclient = 4.5.2 -# When updating httpcore, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +# When updating httpcore, please also update server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy httpcore = 4.4.5 -# When updating httpasyncclient, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +# When updating httpasyncclient, please also update server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy httpasyncclient = 4.1.2 commonslogging = 1.1.3 commonscodec = 1.10 hamcrest = 1.3 securemock = 1.2 -# When updating mocksocket, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +# When updating mocksocket, please also update server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy mocksocket = 1.2 # benchmark dependencies diff --git a/client/rest/build.gradle b/client/rest/build.gradle index ac489f5871116..1c7e86f799f61 100644 --- a/client/rest/build.gradle +++ b/client/rest/build.gradle @@ -57,7 +57,7 @@ dependencies { } forbiddenApisMain { - //client does not depend on core, so only jdk and http signatures should be checked + //client does not depend on server, so only jdk and http signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt'), PrecommitTasks.getResource('/forbidden/http-signatures.txt')] } @@ -66,12 +66,12 @@ forbiddenApisTest { //we are using jdk-internal instead of jdk-non-portable to allow for com.sun.net.httpserver.* usage bundledSignatures -= 'jdk-non-portable' bundledSignatures += 'jdk-internal' - //client does not depend on core, so only jdk signatures should be checked + //client does not depend on server, so only jdk signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt'), PrecommitTasks.getResource('/forbidden/http-signatures.txt')] } -//JarHell is part of es core, which we don't want to pull in +// JarHell is part of es server, which we don't want to pull in jarHell.enabled=false namingConventions { diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle index fdf624e1daa7f..bcde806f4df16 100644 --- a/client/sniffer/build.gradle +++ b/client/sniffer/build.gradle @@ -57,7 +57,7 @@ dependencies { } forbiddenApisMain { - //client does not depend on core, so only jdk signatures should be checked + //client does not depend on server, so only jdk signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } @@ -65,7 +65,7 @@ forbiddenApisTest { //we are using jdk-internal instead of jdk-non-portable to allow for com.sun.net.httpserver.* usage bundledSignatures -= 'jdk-non-portable' bundledSignatures += 'jdk-internal' - //client does not depend on core, so only jdk signatures should be checked + //client does not depend on server, so only jdk signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } @@ -74,7 +74,7 @@ dependencyLicenses { mapping from: /commons-.*/, to: 'commons' } -//JarHell is part of es core, which we don't want to pull in +// JarHell is part of es server, which we don't want to pull in jarHell.enabled=false namingConventions { @@ -101,4 +101,4 @@ thirdPartyAudit.excludes = [ //commons-logging provided dependencies 'javax.servlet.ServletContextEvent', 'javax.servlet.ServletContextListener' -] \ No newline at end of file +] diff --git a/client/test/build.gradle b/client/test/build.gradle index a05443a702758..ccc7be81466a4 100644 --- a/client/test/build.gradle +++ b/client/test/build.gradle @@ -48,7 +48,7 @@ forbiddenApisTest { signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } -//JarHell is part of es core, which we don't want to pull in +// JarHell is part of es server, which we don't want to pull in jarHell.enabled=false // TODO: should we have licenses for our test deps? diff --git a/distribution/build.gradle b/distribution/build.gradle index 542a34bb4f52f..c6fc9d5b6946f 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -59,14 +59,14 @@ task generateDependenciesReport(type: ConcatFilesTask) { * Notice file * *****************************************************************************/ -// integ test zip only uses core, so a different notice file is needed there +// integ test zip only uses server, so a different notice file is needed there task buildCoreNotice(type: NoticeTask) { - licensesDir new File(project(':core').projectDir, 'licenses') + licensesDir new File(project(':server').projectDir, 'licenses') } // other distributions include notices from modules as well, which are added below later task buildFullNotice(type: NoticeTask) { - licensesDir new File(project(':core').projectDir, 'licenses') + licensesDir new File(project(':server').projectDir, 'licenses') } /***************************************************************************** @@ -173,8 +173,8 @@ configure(distributions) { *****************************************************************************/ libFiles = copySpec { into 'lib' - from project(':core').jar - from project(':core').configurations.runtime + from { project(':server').jar } + from { project(':server').configurations.runtime } from { project(':libs:plugin-classloader').jar } // delay add tools using closures, since they have not yet been configured, so no jar task exists yet from { project(':distribution:tools:launchers').jar } diff --git a/docs/build.gradle b/docs/build.gradle index c52e94977f6ee..ad8f7979f2c37 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -32,8 +32,8 @@ integTestCluster { configFile 'analysis/stemmer_override.txt' configFile 'userdict_ja.txt' configFile 'KeywordTokenizer.rbbi' - extraConfigFile 'hunspell/en_US/en_US.aff', '../core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff' - extraConfigFile 'hunspell/en_US/en_US.dic', '../core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic' + extraConfigFile 'hunspell/en_US/en_US.aff', '../server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff' + extraConfigFile 'hunspell/en_US/en_US.dic', '../server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic' // Whitelist reindexing from the local node so we can test it. setting 'reindex.remote.whitelist', '127.0.0.1:*' } diff --git a/core/build.gradle b/server/build.gradle similarity index 98% rename from core/build.gradle rename to server/build.gradle index 32c7017acaae4..20693a30c0cec 100644 --- a/core/build.gradle +++ b/server/build.gradle @@ -92,9 +92,9 @@ dependencies { // repackaged jna with native bits linked against all elastic supported platforms compile "org.elasticsearch:jna:${versions.jna}" - if (isEclipse == false || project.path == ":core-tests") { + if (isEclipse == false || project.path == ":server-tests") { testCompile("org.elasticsearch.test:framework:${version}") { - // tests use the locally compiled version of core + // tests use the locally compiled version of server exclude group: 'org.elasticsearch', module: 'elasticsearch' } } @@ -105,7 +105,7 @@ dependencies { if (isEclipse) { // in eclipse the project is under a fake root, we need to change around the source sets sourceSets { - if (project.path == ":core") { + if (project.path == ":server") { main.java.srcDirs = ['java'] main.resources.srcDirs = ['resources'] } else { @@ -276,7 +276,7 @@ dependencyLicenses { } } -if (isEclipse == false || project.path == ":core-tests") { +if (isEclipse == false || project.path == ":server-tests") { task integTest(type: RandomizedTestingTask, group: JavaBasePlugin.VERIFICATION_GROUP, description: 'Multi-node tests', diff --git a/core/cli/build.gradle b/server/cli/build.gradle similarity index 95% rename from core/cli/build.gradle rename to server/cli/build.gradle index 6f0e2e55eec7e..c41c4d975b082 100644 --- a/core/cli/build.gradle +++ b/server/cli/build.gradle @@ -39,7 +39,7 @@ dependencies { } test.enabled = false -// Since CLI does not depend on :core, it cannot run the jarHell task +// Since CLI does not depend on :server, it cannot run the jarHell task jarHell.enabled = false forbiddenApisMain { diff --git a/core/cli/licenses/jopt-simple-5.0.2.jar.sha1 b/server/cli/licenses/jopt-simple-5.0.2.jar.sha1 similarity index 100% rename from core/cli/licenses/jopt-simple-5.0.2.jar.sha1 rename to server/cli/licenses/jopt-simple-5.0.2.jar.sha1 diff --git a/core/cli/licenses/jopt-simple-LICENSE.txt b/server/cli/licenses/jopt-simple-LICENSE.txt similarity index 100% rename from core/cli/licenses/jopt-simple-LICENSE.txt rename to server/cli/licenses/jopt-simple-LICENSE.txt diff --git a/core/cli/licenses/jopt-simple-NOTICE.txt b/server/cli/licenses/jopt-simple-NOTICE.txt similarity index 100% rename from core/cli/licenses/jopt-simple-NOTICE.txt rename to server/cli/licenses/jopt-simple-NOTICE.txt diff --git a/core/cli/src/main/java/org/elasticsearch/cli/Command.java b/server/cli/src/main/java/org/elasticsearch/cli/Command.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/Command.java rename to server/cli/src/main/java/org/elasticsearch/cli/Command.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java b/server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java rename to server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java b/server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java rename to server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java b/server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java rename to server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/Terminal.java b/server/cli/src/main/java/org/elasticsearch/cli/Terminal.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/Terminal.java rename to server/cli/src/main/java/org/elasticsearch/cli/Terminal.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/UserException.java b/server/cli/src/main/java/org/elasticsearch/cli/UserException.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/UserException.java rename to server/cli/src/main/java/org/elasticsearch/cli/UserException.java diff --git a/core/licenses/HdrHistogram-2.1.9.jar.sha1 b/server/licenses/HdrHistogram-2.1.9.jar.sha1 similarity index 100% rename from core/licenses/HdrHistogram-2.1.9.jar.sha1 rename to server/licenses/HdrHistogram-2.1.9.jar.sha1 diff --git a/core/licenses/HdrHistogram-LICENSE.txt b/server/licenses/HdrHistogram-LICENSE.txt similarity index 100% rename from core/licenses/HdrHistogram-LICENSE.txt rename to server/licenses/HdrHistogram-LICENSE.txt diff --git a/core/licenses/HdrHistogram-NOTICE.txt b/server/licenses/HdrHistogram-NOTICE.txt similarity index 100% rename from core/licenses/HdrHistogram-NOTICE.txt rename to server/licenses/HdrHistogram-NOTICE.txt diff --git a/core/licenses/apache-log4j-extras-DEPENDENCIES b/server/licenses/apache-log4j-extras-DEPENDENCIES similarity index 100% rename from core/licenses/apache-log4j-extras-DEPENDENCIES rename to server/licenses/apache-log4j-extras-DEPENDENCIES diff --git a/core/licenses/hppc-0.7.1.jar.sha1 b/server/licenses/hppc-0.7.1.jar.sha1 similarity index 100% rename from core/licenses/hppc-0.7.1.jar.sha1 rename to server/licenses/hppc-0.7.1.jar.sha1 diff --git a/core/licenses/hppc-LICENSE.txt b/server/licenses/hppc-LICENSE.txt similarity index 100% rename from core/licenses/hppc-LICENSE.txt rename to server/licenses/hppc-LICENSE.txt diff --git a/core/licenses/hppc-NOTICE.txt b/server/licenses/hppc-NOTICE.txt similarity index 100% rename from core/licenses/hppc-NOTICE.txt rename to server/licenses/hppc-NOTICE.txt diff --git a/core/licenses/jackson-LICENSE b/server/licenses/jackson-LICENSE similarity index 100% rename from core/licenses/jackson-LICENSE rename to server/licenses/jackson-LICENSE diff --git a/core/licenses/jackson-NOTICE b/server/licenses/jackson-NOTICE similarity index 100% rename from core/licenses/jackson-NOTICE rename to server/licenses/jackson-NOTICE diff --git a/core/licenses/jackson-core-2.8.10.jar.sha1 b/server/licenses/jackson-core-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-core-2.8.10.jar.sha1 rename to server/licenses/jackson-core-2.8.10.jar.sha1 diff --git a/core/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 b/server/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 rename to server/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 diff --git a/core/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 b/server/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 rename to server/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 diff --git a/core/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 b/server/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 rename to server/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 diff --git a/core/licenses/jna-4.5.1.jar.sha1 b/server/licenses/jna-4.5.1.jar.sha1 similarity index 100% rename from core/licenses/jna-4.5.1.jar.sha1 rename to server/licenses/jna-4.5.1.jar.sha1 diff --git a/core/licenses/jna-LICENSE.txt b/server/licenses/jna-LICENSE.txt similarity index 100% rename from core/licenses/jna-LICENSE.txt rename to server/licenses/jna-LICENSE.txt diff --git a/core/licenses/jna-NOTICE.txt b/server/licenses/jna-NOTICE.txt similarity index 100% rename from core/licenses/jna-NOTICE.txt rename to server/licenses/jna-NOTICE.txt diff --git a/core/licenses/joda-time-2.9.5.jar.sha1 b/server/licenses/joda-time-2.9.5.jar.sha1 similarity index 100% rename from core/licenses/joda-time-2.9.5.jar.sha1 rename to server/licenses/joda-time-2.9.5.jar.sha1 diff --git a/core/licenses/joda-time-LICENSE.txt b/server/licenses/joda-time-LICENSE.txt similarity index 100% rename from core/licenses/joda-time-LICENSE.txt rename to server/licenses/joda-time-LICENSE.txt diff --git a/core/licenses/joda-time-NOTICE.txt b/server/licenses/joda-time-NOTICE.txt similarity index 100% rename from core/licenses/joda-time-NOTICE.txt rename to server/licenses/joda-time-NOTICE.txt diff --git a/core/licenses/jts-1.13.jar.sha1 b/server/licenses/jts-1.13.jar.sha1 similarity index 100% rename from core/licenses/jts-1.13.jar.sha1 rename to server/licenses/jts-1.13.jar.sha1 diff --git a/core/licenses/jts-LICENSE.txt b/server/licenses/jts-LICENSE.txt similarity index 100% rename from core/licenses/jts-LICENSE.txt rename to server/licenses/jts-LICENSE.txt diff --git a/core/licenses/jts-NOTICE.txt b/server/licenses/jts-NOTICE.txt similarity index 100% rename from core/licenses/jts-NOTICE.txt rename to server/licenses/jts-NOTICE.txt diff --git a/core/licenses/log4j-1.2-api-2.9.1.jar.sha1 b/server/licenses/log4j-1.2-api-2.9.1.jar.sha1 similarity index 100% rename from core/licenses/log4j-1.2-api-2.9.1.jar.sha1 rename to server/licenses/log4j-1.2-api-2.9.1.jar.sha1 diff --git a/core/licenses/log4j-LICENSE.txt b/server/licenses/log4j-LICENSE.txt similarity index 100% rename from core/licenses/log4j-LICENSE.txt rename to server/licenses/log4j-LICENSE.txt diff --git a/core/licenses/log4j-NOTICE.txt b/server/licenses/log4j-NOTICE.txt similarity index 100% rename from core/licenses/log4j-NOTICE.txt rename to server/licenses/log4j-NOTICE.txt diff --git a/core/licenses/log4j-api-2.9.1.jar.sha1 b/server/licenses/log4j-api-2.9.1.jar.sha1 similarity index 100% rename from core/licenses/log4j-api-2.9.1.jar.sha1 rename to server/licenses/log4j-api-2.9.1.jar.sha1 diff --git a/core/licenses/log4j-api-LICENSE.txt b/server/licenses/log4j-api-LICENSE.txt similarity index 100% rename from core/licenses/log4j-api-LICENSE.txt rename to server/licenses/log4j-api-LICENSE.txt diff --git a/core/licenses/log4j-api-NOTICE.txt b/server/licenses/log4j-api-NOTICE.txt similarity index 100% rename from core/licenses/log4j-api-NOTICE.txt rename to server/licenses/log4j-api-NOTICE.txt diff --git a/core/licenses/log4j-core-2.9.1.jar.sha1 b/server/licenses/log4j-core-2.9.1.jar.sha1 similarity index 100% rename from core/licenses/log4j-core-2.9.1.jar.sha1 rename to server/licenses/log4j-core-2.9.1.jar.sha1 diff --git a/core/licenses/log4j-core-LICENSE.txt b/server/licenses/log4j-core-LICENSE.txt similarity index 100% rename from core/licenses/log4j-core-LICENSE.txt rename to server/licenses/log4j-core-LICENSE.txt diff --git a/core/licenses/log4j-core-NOTICE.txt b/server/licenses/log4j-core-NOTICE.txt similarity index 100% rename from core/licenses/log4j-core-NOTICE.txt rename to server/licenses/log4j-core-NOTICE.txt diff --git a/core/licenses/lucene-LICENSE.txt b/server/licenses/lucene-LICENSE.txt similarity index 100% rename from core/licenses/lucene-LICENSE.txt rename to server/licenses/lucene-LICENSE.txt diff --git a/core/licenses/lucene-NOTICE.txt b/server/licenses/lucene-NOTICE.txt similarity index 100% rename from core/licenses/lucene-NOTICE.txt rename to server/licenses/lucene-NOTICE.txt diff --git a/core/licenses/lucene-analyzers-common-7.2.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-analyzers-common-7.2.0.jar.sha1 rename to server/licenses/lucene-analyzers-common-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-backward-codecs-7.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-backward-codecs-7.2.0.jar.sha1 rename to server/licenses/lucene-backward-codecs-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-core-7.2.0.jar.sha1 b/server/licenses/lucene-core-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-core-7.2.0.jar.sha1 rename to server/licenses/lucene-core-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-grouping-7.2.0.jar.sha1 b/server/licenses/lucene-grouping-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-grouping-7.2.0.jar.sha1 rename to server/licenses/lucene-grouping-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-highlighter-7.2.0.jar.sha1 b/server/licenses/lucene-highlighter-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-highlighter-7.2.0.jar.sha1 rename to server/licenses/lucene-highlighter-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-join-7.2.0.jar.sha1 b/server/licenses/lucene-join-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-join-7.2.0.jar.sha1 rename to server/licenses/lucene-join-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-memory-7.2.0.jar.sha1 b/server/licenses/lucene-memory-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-memory-7.2.0.jar.sha1 rename to server/licenses/lucene-memory-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-misc-7.2.0.jar.sha1 b/server/licenses/lucene-misc-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-misc-7.2.0.jar.sha1 rename to server/licenses/lucene-misc-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-queries-7.2.0.jar.sha1 b/server/licenses/lucene-queries-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-queries-7.2.0.jar.sha1 rename to server/licenses/lucene-queries-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-queryparser-7.2.0.jar.sha1 b/server/licenses/lucene-queryparser-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-queryparser-7.2.0.jar.sha1 rename to server/licenses/lucene-queryparser-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-sandbox-7.2.0.jar.sha1 b/server/licenses/lucene-sandbox-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-sandbox-7.2.0.jar.sha1 rename to server/licenses/lucene-sandbox-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-spatial-7.2.0.jar.sha1 b/server/licenses/lucene-spatial-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-spatial-7.2.0.jar.sha1 rename to server/licenses/lucene-spatial-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-spatial-extras-7.2.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-spatial-extras-7.2.0.jar.sha1 rename to server/licenses/lucene-spatial-extras-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-spatial3d-7.2.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-spatial3d-7.2.0.jar.sha1 rename to server/licenses/lucene-spatial3d-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-suggest-7.2.0.jar.sha1 b/server/licenses/lucene-suggest-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-suggest-7.2.0.jar.sha1 rename to server/licenses/lucene-suggest-7.2.0.jar.sha1 diff --git a/core/licenses/securesm-1.2.jar.sha1 b/server/licenses/securesm-1.2.jar.sha1 similarity index 100% rename from core/licenses/securesm-1.2.jar.sha1 rename to server/licenses/securesm-1.2.jar.sha1 diff --git a/core/licenses/securesm-LICENSE.txt b/server/licenses/securesm-LICENSE.txt similarity index 100% rename from core/licenses/securesm-LICENSE.txt rename to server/licenses/securesm-LICENSE.txt diff --git a/core/licenses/securesm-NOTICE.txt b/server/licenses/securesm-NOTICE.txt similarity index 100% rename from core/licenses/securesm-NOTICE.txt rename to server/licenses/securesm-NOTICE.txt diff --git a/core/licenses/snakeyaml-1.17.jar.sha1 b/server/licenses/snakeyaml-1.17.jar.sha1 similarity index 100% rename from core/licenses/snakeyaml-1.17.jar.sha1 rename to server/licenses/snakeyaml-1.17.jar.sha1 diff --git a/core/licenses/snakeyaml-LICENSE.txt b/server/licenses/snakeyaml-LICENSE.txt similarity index 100% rename from core/licenses/snakeyaml-LICENSE.txt rename to server/licenses/snakeyaml-LICENSE.txt diff --git a/core/licenses/snakeyaml-NOTICE.txt b/server/licenses/snakeyaml-NOTICE.txt similarity index 100% rename from core/licenses/snakeyaml-NOTICE.txt rename to server/licenses/snakeyaml-NOTICE.txt diff --git a/core/licenses/spatial4j-0.6.jar.sha1 b/server/licenses/spatial4j-0.6.jar.sha1 similarity index 100% rename from core/licenses/spatial4j-0.6.jar.sha1 rename to server/licenses/spatial4j-0.6.jar.sha1 diff --git a/core/licenses/spatial4j-ABOUT.txt b/server/licenses/spatial4j-ABOUT.txt similarity index 100% rename from core/licenses/spatial4j-ABOUT.txt rename to server/licenses/spatial4j-ABOUT.txt diff --git a/core/licenses/spatial4j-LICENSE.txt b/server/licenses/spatial4j-LICENSE.txt similarity index 100% rename from core/licenses/spatial4j-LICENSE.txt rename to server/licenses/spatial4j-LICENSE.txt diff --git a/core/licenses/spatial4j-NOTICE.txt b/server/licenses/spatial4j-NOTICE.txt similarity index 100% rename from core/licenses/spatial4j-NOTICE.txt rename to server/licenses/spatial4j-NOTICE.txt diff --git a/core/licenses/t-digest-3.0.jar.sha1 b/server/licenses/t-digest-3.0.jar.sha1 similarity index 100% rename from core/licenses/t-digest-3.0.jar.sha1 rename to server/licenses/t-digest-3.0.jar.sha1 diff --git a/core/licenses/t-digest-LICENSE.txt b/server/licenses/t-digest-LICENSE.txt similarity index 100% rename from core/licenses/t-digest-LICENSE.txt rename to server/licenses/t-digest-LICENSE.txt diff --git a/core/licenses/t-digest-NOTICE.txt b/server/licenses/t-digest-NOTICE.txt similarity index 100% rename from core/licenses/t-digest-NOTICE.txt rename to server/licenses/t-digest-NOTICE.txt diff --git a/core/src/main/eclipse-build.gradle b/server/src/main/eclipse-build.gradle similarity index 100% rename from core/src/main/eclipse-build.gradle rename to server/src/main/eclipse-build.gradle diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java diff --git a/core/src/main/java/org/apache/lucene/document/BinaryRange.java b/server/src/main/java/org/apache/lucene/document/BinaryRange.java similarity index 100% rename from core/src/main/java/org/apache/lucene/document/BinaryRange.java rename to server/src/main/java/org/apache/lucene/document/BinaryRange.java diff --git a/core/src/main/java/org/apache/lucene/index/OneMergeHelper.java b/server/src/main/java/org/apache/lucene/index/OneMergeHelper.java similarity index 100% rename from core/src/main/java/org/apache/lucene/index/OneMergeHelper.java rename to server/src/main/java/org/apache/lucene/index/OneMergeHelper.java diff --git a/core/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java b/server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java rename to server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java b/server/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java rename to server/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java b/server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java rename to server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/MinDocQuery.java b/server/src/main/java/org/apache/lucene/queries/MinDocQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/MinDocQuery.java rename to server/src/main/java/org/apache/lucene/queries/MinDocQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java b/server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java rename to server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java diff --git a/core/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java b/server/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java rename to server/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java diff --git a/core/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java b/server/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java rename to server/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java rename to server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java rename to server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java rename to server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java diff --git a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java b/server/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java rename to server/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java diff --git a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java b/server/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java rename to server/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java b/server/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java b/server/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java diff --git a/core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java b/server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java rename to server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java diff --git a/core/src/main/java/org/elasticsearch/Assertions.java b/server/src/main/java/org/elasticsearch/Assertions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/Assertions.java rename to server/src/main/java/org/elasticsearch/Assertions.java diff --git a/core/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java similarity index 100% rename from core/src/main/java/org/elasticsearch/Build.java rename to server/src/main/java/org/elasticsearch/Build.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java b/server/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java b/server/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchParseException.java b/server/src/main/java/org/elasticsearch/ElasticsearchParseException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchParseException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchParseException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java b/server/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchStatusException.java b/server/src/main/java/org/elasticsearch/ElasticsearchStatusException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchStatusException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchStatusException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java b/server/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java b/server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java diff --git a/core/src/main/java/org/elasticsearch/ExceptionsHelper.java b/server/src/main/java/org/elasticsearch/ExceptionsHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ExceptionsHelper.java rename to server/src/main/java/org/elasticsearch/ExceptionsHelper.java diff --git a/core/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java b/server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java rename to server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java diff --git a/core/src/main/java/org/elasticsearch/ResourceNotFoundException.java b/server/src/main/java/org/elasticsearch/ResourceNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ResourceNotFoundException.java rename to server/src/main/java/org/elasticsearch/ResourceNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/SpecialPermission.java b/server/src/main/java/org/elasticsearch/SpecialPermission.java similarity index 100% rename from core/src/main/java/org/elasticsearch/SpecialPermission.java rename to server/src/main/java/org/elasticsearch/SpecialPermission.java diff --git a/core/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java similarity index 100% rename from core/src/main/java/org/elasticsearch/Version.java rename to server/src/main/java/org/elasticsearch/Version.java diff --git a/core/src/main/java/org/elasticsearch/action/Action.java b/server/src/main/java/org/elasticsearch/action/Action.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/Action.java rename to server/src/main/java/org/elasticsearch/action/Action.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionFuture.java b/server/src/main/java/org/elasticsearch/action/ActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionFuture.java rename to server/src/main/java/org/elasticsearch/action/ActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionListener.java b/server/src/main/java/org/elasticsearch/action/ActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionListener.java rename to server/src/main/java/org/elasticsearch/action/ActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java b/server/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java rename to server/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionModule.java rename to server/src/main/java/org/elasticsearch/action/ActionModule.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequest.java b/server/src/main/java/org/elasticsearch/action/ActionRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRequest.java rename to server/src/main/java/org/elasticsearch/action/ActionRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java b/server/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java rename to server/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionResponse.java b/server/src/main/java/org/elasticsearch/action/ActionResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionResponse.java rename to server/src/main/java/org/elasticsearch/action/ActionResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRunnable.java b/server/src/main/java/org/elasticsearch/action/ActionRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRunnable.java rename to server/src/main/java/org/elasticsearch/action/ActionRunnable.java diff --git a/core/src/main/java/org/elasticsearch/action/AliasesRequest.java b/server/src/main/java/org/elasticsearch/action/AliasesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/AliasesRequest.java rename to server/src/main/java/org/elasticsearch/action/AliasesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java b/server/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java rename to server/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/DocWriteRequest.java b/server/src/main/java/org/elasticsearch/action/DocWriteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/DocWriteRequest.java rename to server/src/main/java/org/elasticsearch/action/DocWriteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/DocWriteResponse.java b/server/src/main/java/org/elasticsearch/action/DocWriteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/DocWriteResponse.java rename to server/src/main/java/org/elasticsearch/action/DocWriteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/FailedNodeException.java b/server/src/main/java/org/elasticsearch/action/FailedNodeException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/FailedNodeException.java rename to server/src/main/java/org/elasticsearch/action/FailedNodeException.java diff --git a/core/src/main/java/org/elasticsearch/action/GenericAction.java b/server/src/main/java/org/elasticsearch/action/GenericAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/GenericAction.java rename to server/src/main/java/org/elasticsearch/action/GenericAction.java diff --git a/core/src/main/java/org/elasticsearch/action/IndicesRequest.java b/server/src/main/java/org/elasticsearch/action/IndicesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/IndicesRequest.java rename to server/src/main/java/org/elasticsearch/action/IndicesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java b/server/src/main/java/org/elasticsearch/action/LatchedActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/LatchedActionListener.java rename to server/src/main/java/org/elasticsearch/action/LatchedActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java b/server/src/main/java/org/elasticsearch/action/ListenableActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java rename to server/src/main/java/org/elasticsearch/action/ListenableActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java b/server/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java rename to server/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java diff --git a/core/src/main/java/org/elasticsearch/action/NoSuchNodeException.java b/server/src/main/java/org/elasticsearch/action/NoSuchNodeException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/NoSuchNodeException.java rename to server/src/main/java/org/elasticsearch/action/NoSuchNodeException.java diff --git a/core/src/main/java/org/elasticsearch/action/NotifyOnceListener.java b/server/src/main/java/org/elasticsearch/action/NotifyOnceListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/NotifyOnceListener.java rename to server/src/main/java/org/elasticsearch/action/NotifyOnceListener.java diff --git a/core/src/main/java/org/elasticsearch/action/OriginalIndices.java b/server/src/main/java/org/elasticsearch/action/OriginalIndices.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/OriginalIndices.java rename to server/src/main/java/org/elasticsearch/action/OriginalIndices.java diff --git a/core/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java b/server/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java rename to server/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java diff --git a/core/src/main/java/org/elasticsearch/action/RealtimeRequest.java b/server/src/main/java/org/elasticsearch/action/RealtimeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/RealtimeRequest.java rename to server/src/main/java/org/elasticsearch/action/RealtimeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/RoutingMissingException.java b/server/src/main/java/org/elasticsearch/action/RoutingMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/RoutingMissingException.java rename to server/src/main/java/org/elasticsearch/action/RoutingMissingException.java diff --git a/core/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java rename to server/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java diff --git a/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java b/server/src/main/java/org/elasticsearch/action/TaskOperationFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java rename to server/src/main/java/org/elasticsearch/action/TaskOperationFailure.java diff --git a/core/src/main/java/org/elasticsearch/action/ThreadingModel.java b/server/src/main/java/org/elasticsearch/action/ThreadingModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ThreadingModel.java rename to server/src/main/java/org/elasticsearch/action/ThreadingModel.java diff --git a/core/src/main/java/org/elasticsearch/action/TimestampParsingException.java b/server/src/main/java/org/elasticsearch/action/TimestampParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/TimestampParsingException.java rename to server/src/main/java/org/elasticsearch/action/TimestampParsingException.java diff --git a/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java b/server/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java rename to server/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java diff --git a/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java b/server/src/main/java/org/elasticsearch/action/UnavailableShardsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java rename to server/src/main/java/org/elasticsearch/action/UnavailableShardsException.java diff --git a/core/src/main/java/org/elasticsearch/action/ValidateActions.java b/server/src/main/java/org/elasticsearch/action/ValidateActions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ValidateActions.java rename to server/src/main/java/org/elasticsearch/action/ValidateActions.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java b/server/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java rename to server/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java b/server/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java rename to server/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/Retry.java b/server/src/main/java/org/elasticsearch/action/bulk/Retry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/Retry.java rename to server/src/main/java/org/elasticsearch/action/bulk/Retry.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteAction.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteAction.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/server/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java rename to server/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/package-info.java b/server/src/main/java/org/elasticsearch/action/delete/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/package-info.java rename to server/src/main/java/org/elasticsearch/action/delete/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainAction.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainAction.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java rename to server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/package-info.java b/server/src/main/java/org/elasticsearch/action/explain/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/package-info.java rename to server/src/main/java/org/elasticsearch/action/explain/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetAction.java b/server/src/main/java/org/elasticsearch/action/get/GetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetAction.java rename to server/src/main/java/org/elasticsearch/action/get/GetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetRequest.java b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetRequest.java rename to server/src/main/java/org/elasticsearch/action/get/GetRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetResponse.java b/server/src/main/java/org/elasticsearch/action/get/GetResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetResponse.java rename to server/src/main/java/org/elasticsearch/action/get/GetResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/package-info.java b/server/src/main/java/org/elasticsearch/action/get/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/package-info.java rename to server/src/main/java/org/elasticsearch/action/get/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexAction.java b/server/src/main/java/org/elasticsearch/action/index/IndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexAction.java rename to server/src/main/java/org/elasticsearch/action/index/IndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexRequest.java rename to server/src/main/java/org/elasticsearch/action/index/IndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexResponse.java rename to server/src/main/java/org/elasticsearch/action/index/IndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/server/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java rename to server/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/index/package-info.java b/server/src/main/java/org/elasticsearch/action/index/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/package-info.java rename to server/src/main/java/org/elasticsearch/action/index/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java b/server/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java rename to server/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java b/server/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java rename to server/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java rename to server/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java b/server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java rename to server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainAction.java b/server/src/main/java/org/elasticsearch/action/main/MainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainAction.java rename to server/src/main/java/org/elasticsearch/action/main/MainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainRequest.java b/server/src/main/java/org/elasticsearch/action/main/MainRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainRequest.java rename to server/src/main/java/org/elasticsearch/action/main/MainRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainResponse.java b/server/src/main/java/org/elasticsearch/action/main/MainResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainResponse.java rename to server/src/main/java/org/elasticsearch/action/main/MainResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/main/TransportMainAction.java b/server/src/main/java/org/elasticsearch/action/main/TransportMainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/TransportMainAction.java rename to server/src/main/java/org/elasticsearch/action/main/TransportMainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/package-info.java b/server/src/main/java/org/elasticsearch/action/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/package-info.java rename to server/src/main/java/org/elasticsearch/action/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java rename to server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java b/server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java rename to server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java b/server/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java rename to server/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/search/CountedCollector.java b/server/src/main/java/org/elasticsearch/action/search/CountedCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/CountedCollector.java rename to server/src/main/java/org/elasticsearch/action/search/CountedCollector.java diff --git a/core/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java b/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java rename to server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java b/server/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java rename to server/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java b/server/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java rename to server/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java b/server/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java rename to server/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchActionListener.java b/server/src/main/java/org/elasticsearch/action/search/SearchActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchActionListener.java rename to server/src/main/java/org/elasticsearch/action/search/SearchActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java b/server/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java rename to server/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchRequest.java rename to server/src/main/java/org/elasticsearch/action/search/SearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchResponse.java rename to server/src/main/java/org/elasticsearch/action/search/SearchResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java rename to server/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java b/server/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java rename to server/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchTask.java b/server/src/main/java/org/elasticsearch/action/search/SearchTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchTask.java rename to server/src/main/java/org/elasticsearch/action/search/SearchTask.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java b/server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java rename to server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchType.java b/server/src/main/java/org/elasticsearch/action/search/SearchType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchType.java rename to server/src/main/java/org/elasticsearch/action/search/SearchType.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java b/server/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java rename to server/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java rename to server/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/package-info.java b/server/src/main/java/org/elasticsearch/action/search/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/package-info.java rename to server/src/main/java/org/elasticsearch/action/search/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java b/server/src/main/java/org/elasticsearch/action/support/ActionFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActionFilter.java rename to server/src/main/java/org/elasticsearch/action/support/ActionFilter.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java b/server/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java rename to server/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilters.java b/server/src/main/java/org/elasticsearch/action/support/ActionFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActionFilters.java rename to server/src/main/java/org/elasticsearch/action/support/ActionFilters.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java b/server/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java rename to server/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java b/server/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java rename to server/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java diff --git a/core/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java rename to server/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java b/server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java rename to server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java b/server/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java rename to server/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java diff --git a/core/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java b/server/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java b/server/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java rename to server/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java diff --git a/core/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java b/server/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java b/server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java rename to server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/IndicesOptions.java rename to server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java diff --git a/core/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java rename to server/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java rename to server/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java b/server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/TransportAction.java b/server/src/main/java/org/elasticsearch/action/support/TransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/TransportAction.java rename to server/src/main/java/org/elasticsearch/action/support/TransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/TransportActions.java b/server/src/main/java/org/elasticsearch/action/support/TransportActions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/TransportActions.java rename to server/src/main/java/org/elasticsearch/action/support/TransportActions.java diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteRequest.java b/server/src/main/java/org/elasticsearch/action/support/WriteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/WriteRequest.java rename to server/src/main/java/org/elasticsearch/action/support/WriteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteResponse.java b/server/src/main/java/org/elasticsearch/action/support/WriteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/WriteResponse.java rename to server/src/main/java/org/elasticsearch/action/support/WriteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java rename to server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java rename to server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java rename to server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java rename to server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java b/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java rename to server/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java rename to server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java rename to server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java rename to server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java rename to server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java rename to server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java rename to server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java rename to server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java b/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java b/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/package-info.java b/server/src/main/java/org/elasticsearch/action/termvectors/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/package-info.java rename to server/src/main/java/org/elasticsearch/action/termvectors/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java b/server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java rename to server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateAction.java b/server/src/main/java/org/elasticsearch/action/update/UpdateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateAction.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateResponse.java b/server/src/main/java/org/elasticsearch/action/update/UpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateResponse.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java rename to server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java b/server/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java rename to server/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java b/server/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java rename to server/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java b/server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java rename to server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java b/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java rename to server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java b/server/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java rename to server/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/server/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java rename to server/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java b/server/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java rename to server/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/server/src/main/java/org/elasticsearch/bootstrap/JNANatives.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java rename to server/src/main/java/org/elasticsearch/bootstrap/JNANatives.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/server/src/main/java/org/elasticsearch/bootstrap/JarHell.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JarHell.java rename to server/src/main/java/org/elasticsearch/bootstrap/JarHell.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java b/server/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java rename to server/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Natives.java b/server/src/main/java/org/elasticsearch/bootstrap/Natives.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Natives.java rename to server/src/main/java/org/elasticsearch/bootstrap/Natives.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/server/src/main/java/org/elasticsearch/bootstrap/Security.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Security.java rename to server/src/main/java/org/elasticsearch/bootstrap/Security.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Spawner.java b/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Spawner.java rename to server/src/main/java/org/elasticsearch/bootstrap/Spawner.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/StartupException.java b/server/src/main/java/org/elasticsearch/bootstrap/StartupException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/StartupException.java rename to server/src/main/java/org/elasticsearch/bootstrap/StartupException.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java b/server/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java rename to server/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java diff --git a/core/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java b/server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java rename to server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java diff --git a/core/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java b/server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java rename to server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java diff --git a/core/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java b/server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java rename to server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java diff --git a/core/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java b/server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java rename to server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java diff --git a/core/src/main/java/org/elasticsearch/client/AdminClient.java b/server/src/main/java/org/elasticsearch/client/AdminClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/AdminClient.java rename to server/src/main/java/org/elasticsearch/client/AdminClient.java diff --git a/core/src/main/java/org/elasticsearch/client/Client.java b/server/src/main/java/org/elasticsearch/client/Client.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/Client.java rename to server/src/main/java/org/elasticsearch/client/Client.java diff --git a/core/src/main/java/org/elasticsearch/client/ClusterAdminClient.java b/server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/ClusterAdminClient.java rename to server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java diff --git a/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java b/server/src/main/java/org/elasticsearch/client/ElasticsearchClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java rename to server/src/main/java/org/elasticsearch/client/ElasticsearchClient.java diff --git a/core/src/main/java/org/elasticsearch/client/FilterClient.java b/server/src/main/java/org/elasticsearch/client/FilterClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/FilterClient.java rename to server/src/main/java/org/elasticsearch/client/FilterClient.java diff --git a/core/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/IndicesAdminClient.java rename to server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java diff --git a/core/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java b/server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java rename to server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java diff --git a/core/src/main/java/org/elasticsearch/client/Requests.java b/server/src/main/java/org/elasticsearch/client/Requests.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/Requests.java rename to server/src/main/java/org/elasticsearch/client/Requests.java diff --git a/core/src/main/java/org/elasticsearch/client/node/NodeClient.java b/server/src/main/java/org/elasticsearch/client/node/NodeClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/node/NodeClient.java rename to server/src/main/java/org/elasticsearch/client/node/NodeClient.java diff --git a/core/src/main/java/org/elasticsearch/client/package-info.java b/server/src/main/java/org/elasticsearch/client/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/package-info.java rename to server/src/main/java/org/elasticsearch/client/package-info.java diff --git a/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/server/src/main/java/org/elasticsearch/client/support/AbstractClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/support/AbstractClient.java rename to server/src/main/java/org/elasticsearch/client/support/AbstractClient.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java b/server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java rename to server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/TransportClient.java rename to server/src/main/java/org/elasticsearch/client/transport/TransportClient.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java rename to server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java rename to server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java b/server/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java rename to server/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java b/server/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java rename to server/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java b/server/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java rename to server/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java b/server/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java rename to server/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java b/server/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterInfo.java b/server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterInfo.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java b/server/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterModule.java b/server/src/main/java/org/elasticsearch/cluster/ClusterModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterModule.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterModule.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterName.java b/server/src/main/java/org/elasticsearch/cluster/ClusterName.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterName.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterName.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterState.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterState.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/Diff.java b/server/src/main/java/org/elasticsearch/cluster/Diff.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/Diff.java rename to server/src/main/java/org/elasticsearch/cluster/Diff.java diff --git a/core/src/main/java/org/elasticsearch/cluster/Diffable.java b/server/src/main/java/org/elasticsearch/cluster/Diffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/Diffable.java rename to server/src/main/java/org/elasticsearch/cluster/Diffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java b/server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java rename to server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java diff --git a/core/src/main/java/org/elasticsearch/cluster/DiskUsage.java b/server/src/main/java/org/elasticsearch/cluster/DiskUsage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/DiskUsage.java rename to server/src/main/java/org/elasticsearch/cluster/DiskUsage.java diff --git a/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java b/server/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java rename to server/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java b/server/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java rename to server/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java b/server/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java rename to server/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java b/server/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java rename to server/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java b/server/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java rename to server/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java b/server/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java rename to server/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java diff --git a/core/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java b/server/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NamedDiff.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiff.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NamedDiff.java rename to server/src/main/java/org/elasticsearch/cluster/NamedDiff.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NamedDiffable.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NamedDiffable.java rename to server/src/main/java/org/elasticsearch/cluster/NamedDiffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java rename to server/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java b/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java rename to server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NotMasterException.java b/server/src/main/java/org/elasticsearch/cluster/NotMasterException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NotMasterException.java rename to server/src/main/java/org/elasticsearch/cluster/NotMasterException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java b/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java rename to server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java diff --git a/core/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java rename to server/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java diff --git a/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java rename to server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java diff --git a/core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java b/server/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java rename to server/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java b/server/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java rename to server/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java b/server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java rename to server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java b/server/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java rename to server/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java b/server/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java rename to server/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/server/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java rename to server/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java b/server/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java rename to server/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java rename to server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java rename to server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java rename to server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java rename to server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java b/server/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java rename to server/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java rename to server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java b/server/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java rename to server/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java rename to server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java rename to server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java b/server/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java rename to server/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java rename to server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/Preference.java b/server/src/main/java/org/elasticsearch/cluster/routing/Preference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/Preference.java rename to server/src/main/java/org/elasticsearch/cluster/routing/Preference.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java b/server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java b/server/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java b/server/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java rename to server/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java rename to server/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java rename to server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java rename to server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/MasterService.java rename to server/src/main/java/org/elasticsearch/cluster/service/MasterService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java b/server/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java rename to server/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java b/server/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java rename to server/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java b/server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java rename to server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java diff --git a/core/src/main/java/org/elasticsearch/common/Booleans.java b/server/src/main/java/org/elasticsearch/common/Booleans.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Booleans.java rename to server/src/main/java/org/elasticsearch/common/Booleans.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java b/server/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java rename to server/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedConsumer.java b/server/src/main/java/org/elasticsearch/common/CheckedConsumer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedConsumer.java rename to server/src/main/java/org/elasticsearch/common/CheckedConsumer.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedFunction.java b/server/src/main/java/org/elasticsearch/common/CheckedFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedFunction.java rename to server/src/main/java/org/elasticsearch/common/CheckedFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedRunnable.java b/server/src/main/java/org/elasticsearch/common/CheckedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedRunnable.java rename to server/src/main/java/org/elasticsearch/common/CheckedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedSupplier.java b/server/src/main/java/org/elasticsearch/common/CheckedSupplier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedSupplier.java rename to server/src/main/java/org/elasticsearch/common/CheckedSupplier.java diff --git a/core/src/main/java/org/elasticsearch/common/Classes.java b/server/src/main/java/org/elasticsearch/common/Classes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Classes.java rename to server/src/main/java/org/elasticsearch/common/Classes.java diff --git a/core/src/main/java/org/elasticsearch/common/Explicit.java b/server/src/main/java/org/elasticsearch/common/Explicit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Explicit.java rename to server/src/main/java/org/elasticsearch/common/Explicit.java diff --git a/core/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java b/server/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java rename to server/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java diff --git a/core/src/main/java/org/elasticsearch/common/FieldMemoryStats.java b/server/src/main/java/org/elasticsearch/common/FieldMemoryStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/FieldMemoryStats.java rename to server/src/main/java/org/elasticsearch/common/FieldMemoryStats.java diff --git a/core/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/MacAddressProvider.java b/server/src/main/java/org/elasticsearch/common/MacAddressProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/MacAddressProvider.java rename to server/src/main/java/org/elasticsearch/common/MacAddressProvider.java diff --git a/core/src/main/java/org/elasticsearch/common/NamedRegistry.java b/server/src/main/java/org/elasticsearch/common/NamedRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/NamedRegistry.java rename to server/src/main/java/org/elasticsearch/common/NamedRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/Nullable.java b/server/src/main/java/org/elasticsearch/common/Nullable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Nullable.java rename to server/src/main/java/org/elasticsearch/common/Nullable.java diff --git a/core/src/main/java/org/elasticsearch/common/Numbers.java b/server/src/main/java/org/elasticsearch/common/Numbers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Numbers.java rename to server/src/main/java/org/elasticsearch/common/Numbers.java diff --git a/core/src/main/java/org/elasticsearch/common/ParseField.java b/server/src/main/java/org/elasticsearch/common/ParseField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ParseField.java rename to server/src/main/java/org/elasticsearch/common/ParseField.java diff --git a/core/src/main/java/org/elasticsearch/common/ParsingException.java b/server/src/main/java/org/elasticsearch/common/ParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ParsingException.java rename to server/src/main/java/org/elasticsearch/common/ParsingException.java diff --git a/core/src/main/java/org/elasticsearch/common/PidFile.java b/server/src/main/java/org/elasticsearch/common/PidFile.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/PidFile.java rename to server/src/main/java/org/elasticsearch/common/PidFile.java diff --git a/core/src/main/java/org/elasticsearch/common/Priority.java b/server/src/main/java/org/elasticsearch/common/Priority.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Priority.java rename to server/src/main/java/org/elasticsearch/common/Priority.java diff --git a/core/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/Randomness.java b/server/src/main/java/org/elasticsearch/common/Randomness.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Randomness.java rename to server/src/main/java/org/elasticsearch/common/Randomness.java diff --git a/core/src/main/java/org/elasticsearch/common/SecureRandomHolder.java b/server/src/main/java/org/elasticsearch/common/SecureRandomHolder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/SecureRandomHolder.java rename to server/src/main/java/org/elasticsearch/common/SecureRandomHolder.java diff --git a/core/src/main/java/org/elasticsearch/common/StopWatch.java b/server/src/main/java/org/elasticsearch/common/StopWatch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/StopWatch.java rename to server/src/main/java/org/elasticsearch/common/StopWatch.java diff --git a/core/src/main/java/org/elasticsearch/common/Strings.java b/server/src/main/java/org/elasticsearch/common/Strings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Strings.java rename to server/src/main/java/org/elasticsearch/common/Strings.java diff --git a/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java b/server/src/main/java/org/elasticsearch/common/SuppressForbidden.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/SuppressForbidden.java rename to server/src/main/java/org/elasticsearch/common/SuppressForbidden.java diff --git a/core/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java b/server/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java rename to server/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java diff --git a/core/src/main/java/org/elasticsearch/common/Table.java b/server/src/main/java/org/elasticsearch/common/Table.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Table.java rename to server/src/main/java/org/elasticsearch/common/Table.java diff --git a/core/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/TriFunction.java b/server/src/main/java/org/elasticsearch/common/TriFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/TriFunction.java rename to server/src/main/java/org/elasticsearch/common/TriFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/UUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/UUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/UUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/UUIDs.java b/server/src/main/java/org/elasticsearch/common/UUIDs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/UUIDs.java rename to server/src/main/java/org/elasticsearch/common/UUIDs.java diff --git a/core/src/main/java/org/elasticsearch/common/ValidationException.java b/server/src/main/java/org/elasticsearch/common/ValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ValidationException.java rename to server/src/main/java/org/elasticsearch/common/ValidationException.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java rename to server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java b/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java rename to server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java rename to server/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java b/server/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java rename to server/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java b/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java rename to server/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java b/server/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesArray.java b/server/src/main/java/org/elasticsearch/common/bytes/BytesArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/BytesArray.java rename to server/src/main/java/org/elasticsearch/common/bytes/BytesArray.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/BytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/BytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java b/server/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java rename to server/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/Cache.java b/server/src/main/java/org/elasticsearch/common/cache/Cache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/Cache.java rename to server/src/main/java/org/elasticsearch/common/cache/Cache.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java b/server/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java rename to server/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/CacheLoader.java b/server/src/main/java/org/elasticsearch/common/cache/CacheLoader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/CacheLoader.java rename to server/src/main/java/org/elasticsearch/common/cache/CacheLoader.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/RemovalListener.java b/server/src/main/java/org/elasticsearch/common/cache/RemovalListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/RemovalListener.java rename to server/src/main/java/org/elasticsearch/common/cache/RemovalListener.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java b/server/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java rename to server/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java b/server/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java rename to server/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java b/server/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java rename to server/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java b/server/src/main/java/org/elasticsearch/common/collect/HppcMaps.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java rename to server/src/main/java/org/elasticsearch/common/collect/HppcMaps.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java rename to server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java rename to server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/Iterators.java b/server/src/main/java/org/elasticsearch/common/collect/Iterators.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/Iterators.java rename to server/src/main/java/org/elasticsearch/common/collect/Iterators.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/MapBuilder.java b/server/src/main/java/org/elasticsearch/common/collect/MapBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/MapBuilder.java rename to server/src/main/java/org/elasticsearch/common/collect/MapBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/Tuple.java b/server/src/main/java/org/elasticsearch/common/collect/Tuple.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/Tuple.java rename to server/src/main/java/org/elasticsearch/common/collect/Tuple.java diff --git a/core/src/main/java/org/elasticsearch/common/component/AbstractComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/AbstractComponent.java rename to server/src/main/java/org/elasticsearch/common/component/AbstractComponent.java diff --git a/core/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java rename to server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java diff --git a/core/src/main/java/org/elasticsearch/common/component/Lifecycle.java b/server/src/main/java/org/elasticsearch/common/component/Lifecycle.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/Lifecycle.java rename to server/src/main/java/org/elasticsearch/common/component/Lifecycle.java diff --git a/core/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java rename to server/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java diff --git a/core/src/main/java/org/elasticsearch/common/component/LifecycleListener.java b/server/src/main/java/org/elasticsearch/common/component/LifecycleListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/LifecycleListener.java rename to server/src/main/java/org/elasticsearch/common/component/LifecycleListener.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java b/server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java rename to server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/Compressor.java b/server/src/main/java/org/elasticsearch/common/compress/Compressor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/Compressor.java rename to server/src/main/java/org/elasticsearch/common/compress/Compressor.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java b/server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java rename to server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java b/server/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java rename to server/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java b/server/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java rename to server/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/NotXContentException.java b/server/src/main/java/org/elasticsearch/common/compress/NotXContentException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/NotXContentException.java rename to server/src/main/java/org/elasticsearch/common/compress/NotXContentException.java diff --git a/core/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/document/DocumentField.java rename to server/src/main/java/org/elasticsearch/common/document/DocumentField.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/server/src/main/java/org/elasticsearch/common/geo/GeoDistance.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoDistance.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java b/server/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoPoint.java b/server/src/main/java/org/elasticsearch/common/geo/GeoPoint.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoPoint.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoPoint.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java b/server/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java b/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java b/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java rename to server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java b/server/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java rename to server/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java b/server/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java rename to server/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java b/server/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java rename to server/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilders.java b/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilders.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilders.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java diff --git a/core/src/main/java/org/elasticsearch/common/hash/MessageDigests.java b/server/src/main/java/org/elasticsearch/common/hash/MessageDigests.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/hash/MessageDigests.java rename to server/src/main/java/org/elasticsearch/common/hash/MessageDigests.java diff --git a/core/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java b/server/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java rename to server/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/AbstractModule.java b/server/src/main/java/org/elasticsearch/common/inject/AbstractModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/AbstractModule.java rename to server/src/main/java/org/elasticsearch/common/inject/AbstractModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Binder.java b/server/src/main/java/org/elasticsearch/common/inject/Binder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Binder.java rename to server/src/main/java/org/elasticsearch/common/inject/Binder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Binding.java b/server/src/main/java/org/elasticsearch/common/inject/Binding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Binding.java rename to server/src/main/java/org/elasticsearch/common/inject/Binding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java b/server/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java rename to server/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java b/server/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java b/server/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java rename to server/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java b/server/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java b/server/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java rename to server/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/CreationException.java b/server/src/main/java/org/elasticsearch/common/inject/CreationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/CreationException.java rename to server/src/main/java/org/elasticsearch/common/inject/CreationException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java b/server/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java b/server/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java rename to server/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java b/server/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Exposed.java b/server/src/main/java/org/elasticsearch/common/inject/Exposed.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Exposed.java rename to server/src/main/java/org/elasticsearch/common/inject/Exposed.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java b/server/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java b/server/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java rename to server/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Guice.java b/server/src/main/java/org/elasticsearch/common/inject/Guice.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Guice.java rename to server/src/main/java/org/elasticsearch/common/inject/Guice.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java b/server/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java rename to server/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InheritingState.java b/server/src/main/java/org/elasticsearch/common/inject/InheritingState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InheritingState.java rename to server/src/main/java/org/elasticsearch/common/inject/InheritingState.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializable.java b/server/src/main/java/org/elasticsearch/common/inject/Initializable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Initializable.java rename to server/src/main/java/org/elasticsearch/common/inject/Initializable.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializables.java b/server/src/main/java/org/elasticsearch/common/inject/Initializables.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Initializables.java rename to server/src/main/java/org/elasticsearch/common/inject/Initializables.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializer.java b/server/src/main/java/org/elasticsearch/common/inject/Initializer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Initializer.java rename to server/src/main/java/org/elasticsearch/common/inject/Initializer.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Inject.java b/server/src/main/java/org/elasticsearch/common/inject/Inject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Inject.java rename to server/src/main/java/org/elasticsearch/common/inject/Inject.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Injector.java b/server/src/main/java/org/elasticsearch/common/inject/Injector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Injector.java rename to server/src/main/java/org/elasticsearch/common/inject/Injector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorShell.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectorShell.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java b/server/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java rename to server/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Key.java b/server/src/main/java/org/elasticsearch/common/inject/Key.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Key.java rename to server/src/main/java/org/elasticsearch/common/inject/Key.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Lookups.java b/server/src/main/java/org/elasticsearch/common/inject/Lookups.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Lookups.java rename to server/src/main/java/org/elasticsearch/common/inject/Lookups.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MembersInjector.java b/server/src/main/java/org/elasticsearch/common/inject/MembersInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MembersInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/MembersInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java b/server/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java b/server/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java rename to server/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Module.java b/server/src/main/java/org/elasticsearch/common/inject/Module.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Module.java rename to server/src/main/java/org/elasticsearch/common/inject/Module.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java b/server/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java rename to server/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java b/server/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java rename to server/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java b/server/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java rename to server/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PrivateModule.java b/server/src/main/java/org/elasticsearch/common/inject/PrivateModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PrivateModule.java rename to server/src/main/java/org/elasticsearch/common/inject/PrivateModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java b/server/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java rename to server/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Provider.java b/server/src/main/java/org/elasticsearch/common/inject/Provider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Provider.java rename to server/src/main/java/org/elasticsearch/common/inject/Provider.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java b/server/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java rename to server/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Provides.java b/server/src/main/java/org/elasticsearch/common/inject/Provides.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Provides.java rename to server/src/main/java/org/elasticsearch/common/inject/Provides.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProvisionException.java b/server/src/main/java/org/elasticsearch/common/inject/ProvisionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ProvisionException.java rename to server/src/main/java/org/elasticsearch/common/inject/ProvisionException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Reflection.java b/server/src/main/java/org/elasticsearch/common/inject/Reflection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Reflection.java rename to server/src/main/java/org/elasticsearch/common/inject/Reflection.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Scope.java b/server/src/main/java/org/elasticsearch/common/inject/Scope.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Scope.java rename to server/src/main/java/org/elasticsearch/common/inject/Scope.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java b/server/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java rename to server/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Scopes.java b/server/src/main/java/org/elasticsearch/common/inject/Scopes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Scopes.java rename to server/src/main/java/org/elasticsearch/common/inject/Scopes.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Singleton.java b/server/src/main/java/org/elasticsearch/common/inject/Singleton.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Singleton.java rename to server/src/main/java/org/elasticsearch/common/inject/Singleton.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Stage.java b/server/src/main/java/org/elasticsearch/common/inject/Stage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Stage.java rename to server/src/main/java/org/elasticsearch/common/inject/Stage.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/State.java b/server/src/main/java/org/elasticsearch/common/inject/State.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/State.java rename to server/src/main/java/org/elasticsearch/common/inject/State.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java b/server/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java rename to server/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java b/server/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java rename to server/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/binder/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java b/server/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Errors.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Errors.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java b/server/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java b/server/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java b/server/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Join.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Join.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Join.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Join.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java b/server/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java b/server/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java b/server/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java b/server/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java b/server/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Strings.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Strings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Strings.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Strings.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java b/server/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/internal/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/Named.java b/server/src/main/java/org/elasticsearch/common/inject/name/Named.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/Named.java rename to server/src/main/java/org/elasticsearch/common/inject/name/Named.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java b/server/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/Names.java b/server/src/main/java/org/elasticsearch/common/inject/name/Names.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/Names.java rename to server/src/main/java/org/elasticsearch/common/inject/name/Names.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/name/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/name/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Element.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Element.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Element.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Element.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Elements.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Elements.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Elements.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Elements.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java b/server/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java b/server/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Message.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Message.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Message.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Message.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java b/server/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java b/server/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/spi/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/Modules.java b/server/src/main/java/org/elasticsearch/common/inject/util/Modules.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/Modules.java rename to server/src/main/java/org/elasticsearch/common/inject/util/Modules.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/Providers.java b/server/src/main/java/org/elasticsearch/common/inject/util/Providers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/Providers.java rename to server/src/main/java/org/elasticsearch/common/inject/util/Providers.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/Types.java b/server/src/main/java/org/elasticsearch/common/inject/util/Types.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/Types.java rename to server/src/main/java/org/elasticsearch/common/inject/util/Types.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/util/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/util/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/io/Channels.java b/server/src/main/java/org/elasticsearch/common/io/Channels.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/Channels.java rename to server/src/main/java/org/elasticsearch/common/io/Channels.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java b/server/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java rename to server/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java b/server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java rename to server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FastStringReader.java b/server/src/main/java/org/elasticsearch/common/io/FastStringReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FastStringReader.java rename to server/src/main/java/org/elasticsearch/common/io/FastStringReader.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java b/server/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java rename to server/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/io/PathUtils.java b/server/src/main/java/org/elasticsearch/common/io/PathUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/PathUtils.java rename to server/src/main/java/org/elasticsearch/common/io/PathUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/io/Streams.java b/server/src/main/java/org/elasticsearch/common/io/Streams.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/Streams.java rename to server/src/main/java/org/elasticsearch/common/io/Streams.java diff --git a/core/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java b/server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java rename to server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java b/server/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java rename to server/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java b/server/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/Streamable.java b/server/src/main/java/org/elasticsearch/common/io/stream/Streamable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/Streamable.java rename to server/src/main/java/org/elasticsearch/common/io/stream/Streamable.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java b/server/src/main/java/org/elasticsearch/common/io/stream/Writeable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java rename to server/src/main/java/org/elasticsearch/common/io/stream/Writeable.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/package-info.java b/server/src/main/java/org/elasticsearch/common/io/stream/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/package-info.java rename to server/src/main/java/org/elasticsearch/common/io/stream/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/joda/DateMathParser.java b/server/src/main/java/org/elasticsearch/common/joda/DateMathParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/joda/DateMathParser.java rename to server/src/main/java/org/elasticsearch/common/joda/DateMathParser.java diff --git a/core/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java b/server/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java rename to server/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java diff --git a/core/src/main/java/org/elasticsearch/common/joda/Joda.java b/server/src/main/java/org/elasticsearch/common/joda/Joda.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/joda/Joda.java rename to server/src/main/java/org/elasticsearch/common/joda/Joda.java diff --git a/core/src/main/java/org/elasticsearch/common/lease/Releasable.java b/server/src/main/java/org/elasticsearch/common/lease/Releasable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lease/Releasable.java rename to server/src/main/java/org/elasticsearch/common/lease/Releasable.java diff --git a/core/src/main/java/org/elasticsearch/common/lease/Releasables.java b/server/src/main/java/org/elasticsearch/common/lease/Releasables.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lease/Releasables.java rename to server/src/main/java/org/elasticsearch/common/lease/Releasables.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java b/server/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java rename to server/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java b/server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java rename to server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java b/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java rename to server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java b/server/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java rename to server/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/Loggers.java b/server/src/main/java/org/elasticsearch/common/logging/Loggers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/Loggers.java rename to server/src/main/java/org/elasticsearch/common/logging/Loggers.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java b/server/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java rename to server/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java b/server/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java rename to server/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java b/server/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java rename to server/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/Lucene.java rename to server/src/main/java/org/elasticsearch/common/lucene/Lucene.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java b/server/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java rename to server/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java b/server/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java rename to server/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java b/server/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java rename to server/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java b/server/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java rename to server/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/all/AllField.java b/server/src/main/java/org/elasticsearch/common/lucene/all/AllField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/all/AllField.java rename to server/src/main/java/org/elasticsearch/common/lucene/all/AllField.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java b/server/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java rename to server/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java b/server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java b/server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java b/server/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java b/server/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java b/server/src/main/java/org/elasticsearch/common/lucene/search/Queries.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/Queries.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java b/server/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java b/server/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java b/server/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java b/server/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java b/server/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java rename to server/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java rename to server/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java rename to server/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java diff --git a/core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java b/server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java rename to server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java diff --git a/core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java b/server/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java rename to server/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java diff --git a/core/src/main/java/org/elasticsearch/common/metrics/Metric.java b/server/src/main/java/org/elasticsearch/common/metrics/Metric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/metrics/Metric.java rename to server/src/main/java/org/elasticsearch/common/metrics/Metric.java diff --git a/core/src/main/java/org/elasticsearch/common/network/Cidrs.java b/server/src/main/java/org/elasticsearch/common/network/Cidrs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/Cidrs.java rename to server/src/main/java/org/elasticsearch/common/network/Cidrs.java diff --git a/core/src/main/java/org/elasticsearch/common/network/IfConfig.java b/server/src/main/java/org/elasticsearch/common/network/IfConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/IfConfig.java rename to server/src/main/java/org/elasticsearch/common/network/IfConfig.java diff --git a/core/src/main/java/org/elasticsearch/common/network/InetAddresses.java b/server/src/main/java/org/elasticsearch/common/network/InetAddresses.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/InetAddresses.java rename to server/src/main/java/org/elasticsearch/common/network/InetAddresses.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkAddress.java b/server/src/main/java/org/elasticsearch/common/network/NetworkAddress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkAddress.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkAddress.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkModule.java b/server/src/main/java/org/elasticsearch/common/network/NetworkModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkModule.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkModule.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkService.java b/server/src/main/java/org/elasticsearch/common/network/NetworkService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkService.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkService.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkUtils.java b/server/src/main/java/org/elasticsearch/common/network/NetworkUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkUtils.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/path/PathTrie.java b/server/src/main/java/org/elasticsearch/common/path/PathTrie.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/path/PathTrie.java rename to server/src/main/java/org/elasticsearch/common/path/PathTrie.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java rename to server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/Recycler.java b/server/src/main/java/org/elasticsearch/common/recycler/Recycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/Recycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/Recycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java rename to server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java diff --git a/core/src/main/java/org/elasticsearch/common/regex/Regex.java b/server/src/main/java/org/elasticsearch/common/regex/Regex.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/regex/Regex.java rename to server/src/main/java/org/elasticsearch/common/regex/Regex.java diff --git a/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java b/server/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java rename to server/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java b/server/src/main/java/org/elasticsearch/common/rounding/Rounding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/rounding/Rounding.java rename to server/src/main/java/org/elasticsearch/common/rounding/Rounding.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java b/server/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java rename to server/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java b/server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java rename to server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java b/server/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java rename to server/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java b/server/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java rename to server/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SecureSetting.java b/server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SecureSetting.java rename to server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SecureSettings.java b/server/src/main/java/org/elasticsearch/common/settings/SecureSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SecureSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/SecureSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SecureString.java b/server/src/main/java/org/elasticsearch/common/settings/SecureString.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SecureString.java rename to server/src/main/java/org/elasticsearch/common/settings/SecureString.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/Setting.java b/server/src/main/java/org/elasticsearch/common/settings/Setting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/Setting.java rename to server/src/main/java/org/elasticsearch/common/settings/Setting.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/Settings.java b/server/src/main/java/org/elasticsearch/common/settings/Settings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/Settings.java rename to server/src/main/java/org/elasticsearch/common/settings/Settings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsException.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SettingsException.java rename to server/src/main/java/org/elasticsearch/common/settings/SettingsException.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java rename to server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsModule.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SettingsModule.java rename to server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/package-info.java b/server/src/main/java/org/elasticsearch/common/settings/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/package-info.java rename to server/src/main/java/org/elasticsearch/common/settings/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/text/Text.java b/server/src/main/java/org/elasticsearch/common/text/Text.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/text/Text.java rename to server/src/main/java/org/elasticsearch/common/text/Text.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java b/server/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java rename to server/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java b/server/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java rename to server/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java b/server/src/main/java/org/elasticsearch/common/transport/PortsRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/PortsRange.java rename to server/src/main/java/org/elasticsearch/common/transport/PortsRange.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java b/server/src/main/java/org/elasticsearch/common/transport/TransportAddress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java rename to server/src/main/java/org/elasticsearch/common/transport/TransportAddress.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java b/server/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java rename to server/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/server/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java rename to server/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java rename to server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/RatioValue.java b/server/src/main/java/org/elasticsearch/common/unit/RatioValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/RatioValue.java rename to server/src/main/java/org/elasticsearch/common/unit/RatioValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/SizeUnit.java b/server/src/main/java/org/elasticsearch/common/unit/SizeUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/SizeUnit.java rename to server/src/main/java/org/elasticsearch/common/unit/SizeUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/SizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/SizeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/SizeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/SizeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java b/server/src/main/java/org/elasticsearch/common/unit/TimeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/TimeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/TimeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractArray.java b/server/src/main/java/org/elasticsearch/common/util/AbstractArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractArray.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java b/server/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractHash.java b/server/src/main/java/org/elasticsearch/common/util/AbstractHash.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractHash.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractHash.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java b/server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ArrayUtils.java b/server/src/main/java/org/elasticsearch/common/util/ArrayUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ArrayUtils.java rename to server/src/main/java/org/elasticsearch/common/util/ArrayUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigArray.java b/server/src/main/java/org/elasticsearch/common/util/BigArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigArrays.java b/server/src/main/java/org/elasticsearch/common/util/BigArrays.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigArrays.java rename to server/src/main/java/org/elasticsearch/common/util/BigArrays.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java b/server/src/main/java/org/elasticsearch/common/util/BigByteArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigByteArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigByteArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java b/server/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java b/server/src/main/java/org/elasticsearch/common/util/BigFloatArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigFloatArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java b/server/src/main/java/org/elasticsearch/common/util/BigIntArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigIntArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigIntArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java b/server/src/main/java/org/elasticsearch/common/util/BigLongArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigLongArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigLongArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java b/server/src/main/java/org/elasticsearch/common/util/BigObjectArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigObjectArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ByteArray.java b/server/src/main/java/org/elasticsearch/common/util/ByteArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ByteArray.java rename to server/src/main/java/org/elasticsearch/common/util/ByteArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ByteUtils.java b/server/src/main/java/org/elasticsearch/common/util/ByteUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ByteUtils.java rename to server/src/main/java/org/elasticsearch/common/util/ByteUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BytesRefHash.java b/server/src/main/java/org/elasticsearch/common/util/BytesRefHash.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BytesRefHash.java rename to server/src/main/java/org/elasticsearch/common/util/BytesRefHash.java diff --git a/core/src/main/java/org/elasticsearch/common/util/CancellableThreads.java b/server/src/main/java/org/elasticsearch/common/util/CancellableThreads.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/CancellableThreads.java rename to server/src/main/java/org/elasticsearch/common/util/CancellableThreads.java diff --git a/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java rename to server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/Comparators.java b/server/src/main/java/org/elasticsearch/common/util/Comparators.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/Comparators.java rename to server/src/main/java/org/elasticsearch/common/util/Comparators.java diff --git a/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java b/server/src/main/java/org/elasticsearch/common/util/DoubleArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/DoubleArray.java rename to server/src/main/java/org/elasticsearch/common/util/DoubleArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/FloatArray.java b/server/src/main/java/org/elasticsearch/common/util/FloatArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/FloatArray.java rename to server/src/main/java/org/elasticsearch/common/util/FloatArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java b/server/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java rename to server/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java diff --git a/core/src/main/java/org/elasticsearch/common/util/IntArray.java b/server/src/main/java/org/elasticsearch/common/util/IntArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/IntArray.java rename to server/src/main/java/org/elasticsearch/common/util/IntArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LocaleUtils.java b/server/src/main/java/org/elasticsearch/common/util/LocaleUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LocaleUtils.java rename to server/src/main/java/org/elasticsearch/common/util/LocaleUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LongArray.java b/server/src/main/java/org/elasticsearch/common/util/LongArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LongArray.java rename to server/src/main/java/org/elasticsearch/common/util/LongArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LongHash.java b/server/src/main/java/org/elasticsearch/common/util/LongHash.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LongHash.java rename to server/src/main/java/org/elasticsearch/common/util/LongHash.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java b/server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java rename to server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ObjectArray.java b/server/src/main/java/org/elasticsearch/common/util/ObjectArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ObjectArray.java rename to server/src/main/java/org/elasticsearch/common/util/ObjectArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java b/server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java rename to server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java b/server/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java rename to server/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java diff --git a/core/src/main/java/org/elasticsearch/common/util/URIPattern.java b/server/src/main/java/org/elasticsearch/common/util/URIPattern.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/URIPattern.java rename to server/src/main/java/org/elasticsearch/common/util/URIPattern.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java diff --git a/core/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java b/server/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java rename to server/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java diff --git a/core/src/main/java/org/elasticsearch/common/util/set/Sets.java b/server/src/main/java/org/elasticsearch/common/util/set/Sets.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/set/Sets.java rename to server/src/main/java/org/elasticsearch/common/util/set/Sets.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java b/server/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java rename to server/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java b/server/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java b/server/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java rename to server/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java b/server/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java b/server/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentType.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentType.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentType.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java b/server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java rename to server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java b/server/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java rename to server/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/discovery/Discovery.java b/server/src/main/java/org/elasticsearch/discovery/Discovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/Discovery.java rename to server/src/main/java/org/elasticsearch/discovery/Discovery.java diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java b/server/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java rename to server/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/server/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java rename to server/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java b/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java rename to server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java diff --git a/core/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java b/server/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java rename to server/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java diff --git a/core/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java b/server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java rename to server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java b/server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java rename to server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java b/server/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java rename to server/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java b/server/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java rename to server/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java b/server/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java rename to server/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java b/server/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java rename to server/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java b/server/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java rename to server/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java b/server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java b/server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java b/server/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java b/server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java b/server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java b/server/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java rename to server/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java b/server/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java rename to server/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java rename to server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java b/server/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java rename to server/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java diff --git a/core/src/main/java/org/elasticsearch/env/ESFileStore.java b/server/src/main/java/org/elasticsearch/env/ESFileStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/ESFileStore.java rename to server/src/main/java/org/elasticsearch/env/ESFileStore.java diff --git a/core/src/main/java/org/elasticsearch/env/Environment.java b/server/src/main/java/org/elasticsearch/env/Environment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/Environment.java rename to server/src/main/java/org/elasticsearch/env/Environment.java diff --git a/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/NodeEnvironment.java rename to server/src/main/java/org/elasticsearch/env/NodeEnvironment.java diff --git a/core/src/main/java/org/elasticsearch/env/NodeMetaData.java b/server/src/main/java/org/elasticsearch/env/NodeMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/NodeMetaData.java rename to server/src/main/java/org/elasticsearch/env/NodeMetaData.java diff --git a/core/src/main/java/org/elasticsearch/env/ShardLock.java b/server/src/main/java/org/elasticsearch/env/ShardLock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/ShardLock.java rename to server/src/main/java/org/elasticsearch/env/ShardLock.java diff --git a/core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java b/server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java rename to server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java diff --git a/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java rename to server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java diff --git a/core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/CorruptStateException.java b/server/src/main/java/org/elasticsearch/gateway/CorruptStateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/CorruptStateException.java rename to server/src/main/java/org/elasticsearch/gateway/CorruptStateException.java diff --git a/core/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java b/server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java rename to server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java diff --git a/core/src/main/java/org/elasticsearch/gateway/Gateway.java b/server/src/main/java/org/elasticsearch/gateway/Gateway.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/Gateway.java rename to server/src/main/java/org/elasticsearch/gateway/Gateway.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/server/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayException.java b/server/src/main/java/org/elasticsearch/gateway/GatewayException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayException.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayException.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java b/server/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayModule.java b/server/src/main/java/org/elasticsearch/gateway/GatewayModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayModule.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayModule.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayService.java b/server/src/main/java/org/elasticsearch/gateway/GatewayService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayService.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayService.java diff --git a/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java b/server/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java rename to server/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java diff --git a/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/server/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java rename to server/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java diff --git a/core/src/main/java/org/elasticsearch/gateway/MetaStateService.java b/server/src/main/java/org/elasticsearch/gateway/MetaStateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/MetaStateService.java rename to server/src/main/java/org/elasticsearch/gateway/MetaStateService.java diff --git a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/PriorityComparator.java b/server/src/main/java/org/elasticsearch/gateway/PriorityComparator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/PriorityComparator.java rename to server/src/main/java/org/elasticsearch/gateway/PriorityComparator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java rename to server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java diff --git a/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java rename to server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java diff --git a/core/src/main/java/org/elasticsearch/http/BindHttpException.java b/server/src/main/java/org/elasticsearch/http/BindHttpException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/BindHttpException.java rename to server/src/main/java/org/elasticsearch/http/BindHttpException.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpException.java b/server/src/main/java/org/elasticsearch/http/HttpException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpException.java rename to server/src/main/java/org/elasticsearch/http/HttpException.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpInfo.java b/server/src/main/java/org/elasticsearch/http/HttpInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpInfo.java rename to server/src/main/java/org/elasticsearch/http/HttpInfo.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpServerTransport.java b/server/src/main/java/org/elasticsearch/http/HttpServerTransport.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpServerTransport.java rename to server/src/main/java/org/elasticsearch/http/HttpServerTransport.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpStats.java b/server/src/main/java/org/elasticsearch/http/HttpStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpStats.java rename to server/src/main/java/org/elasticsearch/http/HttpStats.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java b/server/src/main/java/org/elasticsearch/http/HttpTransportSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java rename to server/src/main/java/org/elasticsearch/http/HttpTransportSettings.java diff --git a/core/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java b/server/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java rename to server/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java b/server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java rename to server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java diff --git a/core/src/main/java/org/elasticsearch/index/Index.java b/server/src/main/java/org/elasticsearch/index/Index.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/Index.java rename to server/src/main/java/org/elasticsearch/index/Index.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexComponent.java b/server/src/main/java/org/elasticsearch/index/IndexComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexComponent.java rename to server/src/main/java/org/elasticsearch/index/IndexComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexModule.java b/server/src/main/java/org/elasticsearch/index/IndexModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexModule.java rename to server/src/main/java/org/elasticsearch/index/IndexModule.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexNotFoundException.java b/server/src/main/java/org/elasticsearch/index/IndexNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexNotFoundException.java rename to server/src/main/java/org/elasticsearch/index/IndexNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexService.java rename to server/src/main/java/org/elasticsearch/index/IndexService.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexSettings.java b/server/src/main/java/org/elasticsearch/index/IndexSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexSettings.java rename to server/src/main/java/org/elasticsearch/index/IndexSettings.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexSortConfig.java b/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexSortConfig.java rename to server/src/main/java/org/elasticsearch/index/IndexSortConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexWarmer.java b/server/src/main/java/org/elasticsearch/index/IndexWarmer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexWarmer.java rename to server/src/main/java/org/elasticsearch/index/IndexWarmer.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexingSlowLog.java b/server/src/main/java/org/elasticsearch/index/IndexingSlowLog.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexingSlowLog.java rename to server/src/main/java/org/elasticsearch/index/IndexingSlowLog.java diff --git a/core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java b/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java rename to server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java b/server/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java rename to server/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/SearchSlowLog.java b/server/src/main/java/org/elasticsearch/index/SearchSlowLog.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/SearchSlowLog.java rename to server/src/main/java/org/elasticsearch/index/SearchSlowLog.java diff --git a/core/src/main/java/org/elasticsearch/index/SlowLogLevel.java b/server/src/main/java/org/elasticsearch/index/SlowLogLevel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/SlowLogLevel.java rename to server/src/main/java/org/elasticsearch/index/SlowLogLevel.java diff --git a/core/src/main/java/org/elasticsearch/index/VersionType.java b/server/src/main/java/org/elasticsearch/index/VersionType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/VersionType.java rename to server/src/main/java/org/elasticsearch/index/VersionType.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/server/src/main/java/org/elasticsearch/index/analysis/Analysis.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/Analysis.java rename to server/src/main/java/org/elasticsearch/index/analysis/Analysis.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java rename to server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java rename to server/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java b/server/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java rename to server/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java b/server/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java rename to server/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java b/server/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java rename to server/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/server/src/main/java/org/elasticsearch/index/cache/IndexCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/IndexCache.java rename to server/src/main/java/org/elasticsearch/index/cache/IndexCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java b/server/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java rename to server/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java b/server/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java rename to server/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java b/server/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java rename to server/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java b/server/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java rename to server/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java b/server/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java rename to server/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java b/server/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java rename to server/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java b/server/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java rename to server/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java b/server/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java rename to server/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java diff --git a/core/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/codec/CodecService.java rename to server/src/main/java/org/elasticsearch/index/codec/CodecService.java diff --git a/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java rename to server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java rename to server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/CommitStats.java b/server/src/main/java/org/elasticsearch/index/engine/CommitStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/CommitStats.java rename to server/src/main/java/org/elasticsearch/index/engine/CommitStats.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java b/server/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java rename to server/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java b/server/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java rename to server/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java b/server/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java rename to server/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java b/server/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java rename to server/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/Engine.java rename to server/src/main/java/org/elasticsearch/index/engine/Engine.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java b/server/src/main/java/org/elasticsearch/index/engine/EngineConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java b/server/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineException.java b/server/src/main/java/org/elasticsearch/index/engine/EngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineFactory.java b/server/src/main/java/org/elasticsearch/index/engine/EngineFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java b/server/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java b/server/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java rename to server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java b/server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java rename to server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java b/server/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java b/server/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java rename to server/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/Segment.java b/server/src/main/java/org/elasticsearch/index/engine/Segment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/Segment.java rename to server/src/main/java/org/elasticsearch/index/engine/Segment.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java b/server/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java rename to server/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java b/server/src/main/java/org/elasticsearch/index/engine/VersionValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/VersionValue.java rename to server/src/main/java/org/elasticsearch/index/engine/VersionValue.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/FieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/FieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java b/server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java rename to server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java b/server/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java rename to server/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java b/server/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java rename to server/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java b/server/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java rename to server/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java b/server/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java rename to server/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java diff --git a/core/src/main/java/org/elasticsearch/index/flush/FlushStats.java b/server/src/main/java/org/elasticsearch/index/flush/FlushStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/flush/FlushStats.java rename to server/src/main/java/org/elasticsearch/index/flush/FlushStats.java diff --git a/core/src/main/java/org/elasticsearch/index/get/GetResult.java b/server/src/main/java/org/elasticsearch/index/get/GetResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/get/GetResult.java rename to server/src/main/java/org/elasticsearch/index/get/GetResult.java diff --git a/core/src/main/java/org/elasticsearch/index/get/GetStats.java b/server/src/main/java/org/elasticsearch/index/get/GetStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/get/GetStats.java rename to server/src/main/java/org/elasticsearch/index/get/GetStats.java diff --git a/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/get/ShardGetService.java rename to server/src/main/java/org/elasticsearch/index/get/ShardGetService.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java b/server/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java rename to server/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java rename to server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ContentPath.java b/server/src/main/java/org/elasticsearch/index/mapper/ContentPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ContentPath.java rename to server/src/main/java/org/elasticsearch/index/mapper/ContentPath.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java b/server/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java rename to server/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java b/server/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java rename to server/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java rename to server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/Mapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/Mapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperException.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperException.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperException.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperService.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperService.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Mapping.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/Mapping.java rename to server/src/main/java/org/elasticsearch/index/mapper/Mapping.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/server/src/main/java/org/elasticsearch/index/mapper/ParseContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java rename to server/src/main/java/org/elasticsearch/index/mapper/ParseContext.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java b/server/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java rename to server/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java rename to server/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java b/server/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java rename to server/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java rename to server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Uid.java b/server/src/main/java/org/elasticsearch/index/mapper/Uid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/Uid.java rename to server/src/main/java/org/elasticsearch/index/mapper/Uid.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/merge/MergeStats.java b/server/src/main/java/org/elasticsearch/index/merge/MergeStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/merge/MergeStats.java rename to server/src/main/java/org/elasticsearch/index/merge/MergeStats.java diff --git a/core/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java b/server/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java rename to server/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java diff --git a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoExecType.java b/server/src/main/java/org/elasticsearch/index/query/GeoExecType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoExecType.java rename to server/src/main/java/org/elasticsearch/index/query/GeoExecType.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java b/server/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java rename to server/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java diff --git a/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/Operator.java b/server/src/main/java/org/elasticsearch/index/query/Operator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/Operator.java rename to server/src/main/java/org/elasticsearch/index/query/Operator.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ParsedQuery.java b/server/src/main/java/org/elasticsearch/index/query/ParsedQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ParsedQuery.java rename to server/src/main/java/org/elasticsearch/index/query/ParsedQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/QueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/QueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java rename to server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryParser.java b/server/src/main/java/org/elasticsearch/index/query/QueryParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryParser.java rename to server/src/main/java/org/elasticsearch/index/query/QueryParser.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java rename to server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryShardContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryShardContext.java rename to server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryShardException.java b/server/src/main/java/org/elasticsearch/index/query/QueryShardException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryShardException.java rename to server/src/main/java/org/elasticsearch/index/query/QueryShardException.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryValidationException.java b/server/src/main/java/org/elasticsearch/index/query/QueryValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryValidationException.java rename to server/src/main/java/org/elasticsearch/index/query/QueryValidationException.java diff --git a/core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java b/server/src/main/java/org/elasticsearch/index/query/RegexpFlag.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java rename to server/src/main/java/org/elasticsearch/index/query/RegexpFlag.java diff --git a/core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/Rewriteable.java b/server/src/main/java/org/elasticsearch/index/query/Rewriteable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/Rewriteable.java rename to server/src/main/java/org/elasticsearch/index/query/Rewriteable.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java b/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java rename to server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/support/NestedScope.java b/server/src/main/java/org/elasticsearch/index/query/support/NestedScope.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/support/NestedScope.java rename to server/src/main/java/org/elasticsearch/index/query/support/NestedScope.java diff --git a/core/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java b/server/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java rename to server/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java diff --git a/core/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java b/server/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java rename to server/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java diff --git a/core/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java b/server/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java rename to server/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java rename to server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java rename to server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java b/server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java rename to server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java b/server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java rename to server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java b/server/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java rename to server/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java rename to server/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java b/server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java rename to server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java b/server/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java rename to server/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java b/server/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java rename to server/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java rename to server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java b/server/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java rename to server/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java diff --git a/core/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java b/server/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java rename to server/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/MatchQuery.java rename to server/src/main/java/org/elasticsearch/index/search/MatchQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java rename to server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/search/NestedHelper.java b/server/src/main/java/org/elasticsearch/index/search/NestedHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/NestedHelper.java rename to server/src/main/java/org/elasticsearch/index/search/NestedHelper.java diff --git a/core/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java b/server/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java rename to server/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java diff --git a/core/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java rename to server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java diff --git a/core/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java rename to server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java diff --git a/core/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java rename to server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java diff --git a/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java rename to server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java b/server/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java rename to server/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java b/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java rename to server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java b/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java rename to server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java b/server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java rename to server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java b/server/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java rename to server/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java b/server/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java rename to server/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java diff --git a/core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java b/server/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java rename to server/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java b/server/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java rename to server/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/DocsStats.java b/server/src/main/java/org/elasticsearch/index/shard/DocsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/DocsStats.java rename to server/src/main/java/org/elasticsearch/index/shard/DocsStats.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java b/server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java rename to server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java b/server/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java rename to server/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java b/server/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java b/server/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShard.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShard.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardState.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardState.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardState.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java b/server/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexingStats.java b/server/src/main/java/org/elasticsearch/index/shard/IndexingStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexingStats.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexingStats.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java b/server/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java rename to server/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java b/server/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java rename to server/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java rename to server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java b/server/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java rename to server/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java b/server/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java rename to server/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java b/server/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java rename to server/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardId.java b/server/src/main/java/org/elasticsearch/index/shard/ShardId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardId.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardId.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java b/server/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java b/server/src/main/java/org/elasticsearch/index/shard/ShardPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardPath.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardPath.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java b/server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java b/server/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardUtils.java b/server/src/main/java/org/elasticsearch/index/shard/ShardUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardUtils.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardUtils.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java b/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java rename to server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java rename to server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java rename to server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java diff --git a/core/src/main/java/org/elasticsearch/index/store/DirectoryService.java b/server/src/main/java/org/elasticsearch/index/store/DirectoryService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/DirectoryService.java rename to server/src/main/java/org/elasticsearch/index/store/DirectoryService.java diff --git a/core/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java b/server/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java rename to server/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java diff --git a/core/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java b/server/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java rename to server/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java diff --git a/core/src/main/java/org/elasticsearch/index/store/IndexStore.java b/server/src/main/java/org/elasticsearch/index/store/IndexStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/IndexStore.java rename to server/src/main/java/org/elasticsearch/index/store/IndexStore.java diff --git a/core/src/main/java/org/elasticsearch/index/store/Store.java b/server/src/main/java/org/elasticsearch/index/store/Store.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/Store.java rename to server/src/main/java/org/elasticsearch/index/store/Store.java diff --git a/core/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java b/server/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java rename to server/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java diff --git a/core/src/main/java/org/elasticsearch/index/store/StoreStats.java b/server/src/main/java/org/elasticsearch/index/store/StoreStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/StoreStats.java rename to server/src/main/java/org/elasticsearch/index/store/StoreStats.java diff --git a/core/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java b/server/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java rename to server/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java diff --git a/core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java b/server/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java rename to server/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java b/server/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java rename to server/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java b/server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java rename to server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java b/server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java rename to server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java b/server/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java rename to server/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java b/server/src/main/java/org/elasticsearch/index/translog/Checkpoint.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java rename to server/src/main/java/org/elasticsearch/index/translog/Checkpoint.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java b/server/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java rename to server/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/Translog.java b/server/src/main/java/org/elasticsearch/index/translog/Translog.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/Translog.java rename to server/src/main/java/org/elasticsearch/index/translog/Translog.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogException.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogException.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogException.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogReader.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogReader.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogReader.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java b/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java rename to server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java b/server/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java rename to server/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java diff --git a/core/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java b/server/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java rename to server/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java diff --git a/core/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java b/server/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java rename to server/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java b/server/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java rename to server/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java diff --git a/core/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java b/server/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java rename to server/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexClosedException.java b/server/src/main/java/org/elasticsearch/indices/IndexClosedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexClosedException.java rename to server/src/main/java/org/elasticsearch/indices/IndexClosedException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexCreationException.java b/server/src/main/java/org/elasticsearch/indices/IndexCreationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexCreationException.java rename to server/src/main/java/org/elasticsearch/indices/IndexCreationException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java b/server/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java rename to server/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java b/server/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java rename to server/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java b/server/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java rename to server/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesModule.java b/server/src/main/java/org/elasticsearch/indices/IndicesModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesModule.java rename to server/src/main/java/org/elasticsearch/indices/IndicesModule.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java rename to server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java rename to server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesService.java rename to server/src/main/java/org/elasticsearch/indices/IndicesService.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java b/server/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java b/server/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java b/server/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java b/server/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java diff --git a/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java b/server/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java rename to server/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/TermsLookup.java b/server/src/main/java/org/elasticsearch/indices/TermsLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/TermsLookup.java rename to server/src/main/java/org/elasticsearch/indices/TermsLookup.java diff --git a/core/src/main/java/org/elasticsearch/indices/TypeMissingException.java b/server/src/main/java/org/elasticsearch/indices/TypeMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/TypeMissingException.java rename to server/src/main/java/org/elasticsearch/indices/TypeMissingException.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java b/server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java rename to server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java b/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java rename to server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java rename to server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java rename to server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java rename to server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java b/server/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java rename to server/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java b/server/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java rename to server/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java rename to server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java b/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java rename to server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java rename to server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java rename to server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java diff --git a/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java rename to server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java diff --git a/core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java rename to server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java diff --git a/core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java b/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java rename to server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java diff --git a/core/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java b/server/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java rename to server/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java diff --git a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java rename to server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java diff --git a/core/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java b/server/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java rename to server/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java b/server/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java rename to server/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java rename to server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java rename to server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java rename to server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java diff --git a/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java rename to server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java diff --git a/core/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java b/server/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java rename to server/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java diff --git a/core/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java rename to server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java diff --git a/core/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java b/server/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java rename to server/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestDocument.java b/server/src/main/java/org/elasticsearch/ingest/IngestDocument.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestDocument.java rename to server/src/main/java/org/elasticsearch/ingest/IngestDocument.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestInfo.java b/server/src/main/java/org/elasticsearch/ingest/IngestInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestInfo.java rename to server/src/main/java/org/elasticsearch/ingest/IngestInfo.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java b/server/src/main/java/org/elasticsearch/ingest/IngestMetadata.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java rename to server/src/main/java/org/elasticsearch/ingest/IngestMetadata.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestService.java rename to server/src/main/java/org/elasticsearch/ingest/IngestService.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestStats.java b/server/src/main/java/org/elasticsearch/ingest/IngestStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestStats.java rename to server/src/main/java/org/elasticsearch/ingest/IngestStats.java diff --git a/core/src/main/java/org/elasticsearch/ingest/Pipeline.java b/server/src/main/java/org/elasticsearch/ingest/Pipeline.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/Pipeline.java rename to server/src/main/java/org/elasticsearch/ingest/Pipeline.java diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java rename to server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java b/server/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java rename to server/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineStore.java b/server/src/main/java/org/elasticsearch/ingest/PipelineStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/PipelineStore.java rename to server/src/main/java/org/elasticsearch/ingest/PipelineStore.java diff --git a/core/src/main/java/org/elasticsearch/ingest/Processor.java b/server/src/main/java/org/elasticsearch/ingest/Processor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/Processor.java rename to server/src/main/java/org/elasticsearch/ingest/Processor.java diff --git a/core/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java b/server/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java rename to server/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java diff --git a/core/src/main/java/org/elasticsearch/ingest/ValueSource.java b/server/src/main/java/org/elasticsearch/ingest/ValueSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/ValueSource.java rename to server/src/main/java/org/elasticsearch/ingest/ValueSource.java diff --git a/core/src/main/java/org/elasticsearch/monitor/MonitorService.java b/server/src/main/java/org/elasticsearch/monitor/MonitorService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/MonitorService.java rename to server/src/main/java/org/elasticsearch/monitor/MonitorService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/Probes.java b/server/src/main/java/org/elasticsearch/monitor/Probes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/Probes.java rename to server/src/main/java/org/elasticsearch/monitor/Probes.java diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java rename to server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java rename to server/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/fs/FsService.java rename to server/src/main/java/org/elasticsearch/monitor/fs/FsService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java b/server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java b/server/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java rename to server/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsInfo.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java b/server/src/main/java/org/elasticsearch/monitor/os/OsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsService.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsStats.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsStats.java diff --git a/core/src/main/java/org/elasticsearch/monitor/package-info.java b/server/src/main/java/org/elasticsearch/monitor/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/package-info.java rename to server/src/main/java/org/elasticsearch/monitor/package-info.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java diff --git a/core/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java b/server/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java rename to server/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java diff --git a/core/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java b/server/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java rename to server/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java diff --git a/core/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/Node.java rename to server/src/main/java/org/elasticsearch/node/Node.java diff --git a/core/src/main/java/org/elasticsearch/node/NodeClosedException.java b/server/src/main/java/org/elasticsearch/node/NodeClosedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/NodeClosedException.java rename to server/src/main/java/org/elasticsearch/node/NodeClosedException.java diff --git a/core/src/main/java/org/elasticsearch/node/NodeService.java b/server/src/main/java/org/elasticsearch/node/NodeService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/NodeService.java rename to server/src/main/java/org/elasticsearch/node/NodeService.java diff --git a/core/src/main/java/org/elasticsearch/node/NodeValidationException.java b/server/src/main/java/org/elasticsearch/node/NodeValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/NodeValidationException.java rename to server/src/main/java/org/elasticsearch/node/NodeValidationException.java diff --git a/core/src/main/java/org/elasticsearch/node/ResponseCollectorService.java b/server/src/main/java/org/elasticsearch/node/ResponseCollectorService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/ResponseCollectorService.java rename to server/src/main/java/org/elasticsearch/node/ResponseCollectorService.java diff --git a/core/src/main/java/org/elasticsearch/node/package-info.java b/server/src/main/java/org/elasticsearch/node/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/package-info.java rename to server/src/main/java/org/elasticsearch/node/package-info.java diff --git a/core/src/main/java/org/elasticsearch/package-info.java b/server/src/main/java/org/elasticsearch/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/package-info.java rename to server/src/main/java/org/elasticsearch/package-info.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ActionPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ActionPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java b/server/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java b/server/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java b/server/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/IngestPlugin.java b/server/src/main/java/org/elasticsearch/plugins/IngestPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/IngestPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/IngestPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/MapperPlugin.java b/server/src/main/java/org/elasticsearch/plugins/MapperPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/MapperPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/MapperPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java b/server/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java rename to server/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java diff --git a/core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java b/server/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java rename to server/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java diff --git a/core/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java b/server/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/Platforms.java b/server/src/main/java/org/elasticsearch/plugins/Platforms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/Platforms.java rename to server/src/main/java/org/elasticsearch/plugins/Platforms.java diff --git a/core/src/main/java/org/elasticsearch/plugins/Plugin.java b/server/src/main/java/org/elasticsearch/plugins/Plugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/Plugin.java rename to server/src/main/java/org/elasticsearch/plugins/Plugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java b/server/src/main/java/org/elasticsearch/plugins/PluginInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginInfo.java rename to server/src/main/java/org/elasticsearch/plugins/PluginInfo.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java b/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java rename to server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginSecurity.java b/server/src/main/java/org/elasticsearch/plugins/PluginSecurity.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginSecurity.java rename to server/src/main/java/org/elasticsearch/plugins/PluginSecurity.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginsService.java b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginsService.java rename to server/src/main/java/org/elasticsearch/plugins/PluginsService.java diff --git a/core/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java b/server/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/SearchPlugin.java b/server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/SearchPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/package-info.java b/server/src/main/java/org/elasticsearch/plugins/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/package-info.java rename to server/src/main/java/org/elasticsearch/plugins/package-info.java diff --git a/core/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java b/server/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java rename to server/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java diff --git a/core/src/main/java/org/elasticsearch/plugins/spi/package-info.java b/server/src/main/java/org/elasticsearch/plugins/spi/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/spi/package-info.java rename to server/src/main/java/org/elasticsearch/plugins/spi/package-info.java diff --git a/core/src/main/java/org/elasticsearch/repositories/IndexId.java b/server/src/main/java/org/elasticsearch/repositories/IndexId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/IndexId.java rename to server/src/main/java/org/elasticsearch/repositories/IndexId.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java diff --git a/core/src/main/java/org/elasticsearch/repositories/Repository.java b/server/src/main/java/org/elasticsearch/repositories/Repository.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/Repository.java rename to server/src/main/java/org/elasticsearch/repositories/Repository.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryData.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryData.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryData.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryException.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryException.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java diff --git a/core/src/main/java/org/elasticsearch/repositories/VerificationFailure.java b/server/src/main/java/org/elasticsearch/repositories/VerificationFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/VerificationFailure.java rename to server/src/main/java/org/elasticsearch/repositories/VerificationFailure.java diff --git a/core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java b/server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java rename to server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java rename to server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java rename to server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java rename to server/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java diff --git a/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java b/server/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java rename to server/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java diff --git a/core/src/main/java/org/elasticsearch/repositories/package-info.java b/server/src/main/java/org/elasticsearch/repositories/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/package-info.java rename to server/src/main/java/org/elasticsearch/repositories/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java b/server/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java rename to server/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java diff --git a/core/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/BaseRestHandler.java rename to server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java diff --git a/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java rename to server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java diff --git a/core/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java b/server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java rename to server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java diff --git a/core/src/main/java/org/elasticsearch/rest/MethodHandlers.java b/server/src/main/java/org/elasticsearch/rest/MethodHandlers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/MethodHandlers.java rename to server/src/main/java/org/elasticsearch/rest/MethodHandlers.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestChannel.java b/server/src/main/java/org/elasticsearch/rest/RestChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestChannel.java rename to server/src/main/java/org/elasticsearch/rest/RestChannel.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestController.java rename to server/src/main/java/org/elasticsearch/rest/RestController.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestHandler.java b/server/src/main/java/org/elasticsearch/rest/RestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestHandler.java rename to server/src/main/java/org/elasticsearch/rest/RestHandler.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestRequest.java b/server/src/main/java/org/elasticsearch/rest/RestRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestRequest.java rename to server/src/main/java/org/elasticsearch/rest/RestRequest.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestResponse.java b/server/src/main/java/org/elasticsearch/rest/RestResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestResponse.java rename to server/src/main/java/org/elasticsearch/rest/RestResponse.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestStatus.java b/server/src/main/java/org/elasticsearch/rest/RestStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestStatus.java rename to server/src/main/java/org/elasticsearch/rest/RestStatus.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestUtils.java b/server/src/main/java/org/elasticsearch/rest/RestUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestUtils.java rename to server/src/main/java/org/elasticsearch/rest/RestUtils.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java b/server/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java rename to server/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestActionListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestActionListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestActionListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestActions.java b/server/src/main/java/org/elasticsearch/rest/action/RestActions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestActions.java rename to server/src/main/java/org/elasticsearch/rest/action/RestActions.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestMainAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestMainAction.java rename to server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/cat/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/document/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/document/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/search/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/search/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/package-info.java b/server/src/main/java/org/elasticsearch/rest/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/package-info.java rename to server/src/main/java/org/elasticsearch/rest/package-info.java diff --git a/core/src/main/java/org/elasticsearch/script/ClassPermission.java b/server/src/main/java/org/elasticsearch/script/ClassPermission.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ClassPermission.java rename to server/src/main/java/org/elasticsearch/script/ClassPermission.java diff --git a/core/src/main/java/org/elasticsearch/script/ExecutableScript.java b/server/src/main/java/org/elasticsearch/script/ExecutableScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ExecutableScript.java rename to server/src/main/java/org/elasticsearch/script/ExecutableScript.java diff --git a/core/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java b/server/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java rename to server/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java diff --git a/core/src/main/java/org/elasticsearch/script/FilterScript.java b/server/src/main/java/org/elasticsearch/script/FilterScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/FilterScript.java rename to server/src/main/java/org/elasticsearch/script/FilterScript.java diff --git a/core/src/main/java/org/elasticsearch/script/GeneralScriptException.java b/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/GeneralScriptException.java rename to server/src/main/java/org/elasticsearch/script/GeneralScriptException.java diff --git a/core/src/main/java/org/elasticsearch/script/ScoreAccessor.java b/server/src/main/java/org/elasticsearch/script/ScoreAccessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScoreAccessor.java rename to server/src/main/java/org/elasticsearch/script/ScoreAccessor.java diff --git a/core/src/main/java/org/elasticsearch/script/Script.java b/server/src/main/java/org/elasticsearch/script/Script.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/Script.java rename to server/src/main/java/org/elasticsearch/script/Script.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptContext.java b/server/src/main/java/org/elasticsearch/script/ScriptContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptContext.java rename to server/src/main/java/org/elasticsearch/script/ScriptContext.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptEngine.java b/server/src/main/java/org/elasticsearch/script/ScriptEngine.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptEngine.java rename to server/src/main/java/org/elasticsearch/script/ScriptEngine.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptException.java b/server/src/main/java/org/elasticsearch/script/ScriptException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptException.java rename to server/src/main/java/org/elasticsearch/script/ScriptException.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptMetaData.java b/server/src/main/java/org/elasticsearch/script/ScriptMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptMetaData.java rename to server/src/main/java/org/elasticsearch/script/ScriptMetaData.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptMetrics.java b/server/src/main/java/org/elasticsearch/script/ScriptMetrics.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptMetrics.java rename to server/src/main/java/org/elasticsearch/script/ScriptMetrics.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptModule.java b/server/src/main/java/org/elasticsearch/script/ScriptModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptModule.java rename to server/src/main/java/org/elasticsearch/script/ScriptModule.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptService.java b/server/src/main/java/org/elasticsearch/script/ScriptService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptService.java rename to server/src/main/java/org/elasticsearch/script/ScriptService.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptStats.java b/server/src/main/java/org/elasticsearch/script/ScriptStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptStats.java rename to server/src/main/java/org/elasticsearch/script/ScriptStats.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptType.java b/server/src/main/java/org/elasticsearch/script/ScriptType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptType.java rename to server/src/main/java/org/elasticsearch/script/ScriptType.java diff --git a/core/src/main/java/org/elasticsearch/script/SearchScript.java b/server/src/main/java/org/elasticsearch/script/SearchScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/SearchScript.java rename to server/src/main/java/org/elasticsearch/script/SearchScript.java diff --git a/core/src/main/java/org/elasticsearch/script/SimilarityScript.java b/server/src/main/java/org/elasticsearch/script/SimilarityScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/SimilarityScript.java rename to server/src/main/java/org/elasticsearch/script/SimilarityScript.java diff --git a/core/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java b/server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java rename to server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java diff --git a/core/src/main/java/org/elasticsearch/script/StoredScriptSource.java b/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/StoredScriptSource.java rename to server/src/main/java/org/elasticsearch/script/StoredScriptSource.java diff --git a/core/src/main/java/org/elasticsearch/script/TemplateScript.java b/server/src/main/java/org/elasticsearch/script/TemplateScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/TemplateScript.java rename to server/src/main/java/org/elasticsearch/script/TemplateScript.java diff --git a/core/src/main/java/org/elasticsearch/script/package-info.java b/server/src/main/java/org/elasticsearch/script/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/package-info.java rename to server/src/main/java/org/elasticsearch/script/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/DefaultSearchContext.java b/server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/DefaultSearchContext.java rename to server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/DocValueFormat.java b/server/src/main/java/org/elasticsearch/search/DocValueFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/DocValueFormat.java rename to server/src/main/java/org/elasticsearch/search/DocValueFormat.java diff --git a/core/src/main/java/org/elasticsearch/search/MultiValueMode.java b/server/src/main/java/org/elasticsearch/search/MultiValueMode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/MultiValueMode.java rename to server/src/main/java/org/elasticsearch/search/MultiValueMode.java diff --git a/core/src/main/java/org/elasticsearch/search/Scroll.java b/server/src/main/java/org/elasticsearch/search/Scroll.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/Scroll.java rename to server/src/main/java/org/elasticsearch/search/Scroll.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchContextException.java b/server/src/main/java/org/elasticsearch/search/SearchContextException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchContextException.java rename to server/src/main/java/org/elasticsearch/search/SearchContextException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchContextMissingException.java b/server/src/main/java/org/elasticsearch/search/SearchContextMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchContextMissingException.java rename to server/src/main/java/org/elasticsearch/search/SearchContextMissingException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchException.java b/server/src/main/java/org/elasticsearch/search/SearchException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchException.java rename to server/src/main/java/org/elasticsearch/search/SearchException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchExtBuilder.java b/server/src/main/java/org/elasticsearch/search/SearchExtBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchExtBuilder.java rename to server/src/main/java/org/elasticsearch/search/SearchExtBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchHit.java rename to server/src/main/java/org/elasticsearch/search/SearchHit.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchHits.java b/server/src/main/java/org/elasticsearch/search/SearchHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchHits.java rename to server/src/main/java/org/elasticsearch/search/SearchHits.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchModule.java b/server/src/main/java/org/elasticsearch/search/SearchModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchModule.java rename to server/src/main/java/org/elasticsearch/search/SearchModule.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchParseException.java b/server/src/main/java/org/elasticsearch/search/SearchParseException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchParseException.java rename to server/src/main/java/org/elasticsearch/search/SearchParseException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchPhase.java b/server/src/main/java/org/elasticsearch/search/SearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchPhase.java rename to server/src/main/java/org/elasticsearch/search/SearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchPhaseResult.java b/server/src/main/java/org/elasticsearch/search/SearchPhaseResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchPhaseResult.java rename to server/src/main/java/org/elasticsearch/search/SearchPhaseResult.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchService.java rename to server/src/main/java/org/elasticsearch/search/SearchService.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java b/server/src/main/java/org/elasticsearch/search/SearchShardTarget.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchShardTarget.java rename to server/src/main/java/org/elasticsearch/search/SearchShardTarget.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchSortValues.java b/server/src/main/java/org/elasticsearch/search/SearchSortValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchSortValues.java rename to server/src/main/java/org/elasticsearch/search/SearchSortValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java b/server/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java b/server/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java rename to server/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java b/server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java rename to server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java b/server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java rename to server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/package-info.java b/server/src/main/java/org/elasticsearch/search/aggregations/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/package-info.java rename to server/src/main/java/org/elasticsearch/search/aggregations/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java rename to server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java diff --git a/core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java b/server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java rename to server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java b/server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java rename to server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java b/server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java rename to server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java rename to server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java rename to server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java rename to server/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java rename to server/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java rename to server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java rename to server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/package-info.java b/server/src/main/java/org/elasticsearch/search/fetch/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/package-info.java rename to server/src/main/java/org/elasticsearch/search/fetch/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/AliasFilter.java b/server/src/main/java/org/elasticsearch/search/internal/AliasFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/AliasFilter.java rename to server/src/main/java/org/elasticsearch/search/internal/AliasFilter.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java b/server/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java rename to server/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java rename to server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java rename to server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java b/server/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java rename to server/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java b/server/src/main/java/org/elasticsearch/search/internal/ScrollContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java rename to server/src/main/java/org/elasticsearch/search/internal/ScrollContext.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/SearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/SearchContext.java rename to server/src/main/java/org/elasticsearch/search/internal/SearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java rename to server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/DocLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/DocLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java b/server/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java rename to server/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java b/server/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java rename to server/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java b/server/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java rename to server/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java b/server/src/main/java/org/elasticsearch/search/profile/ProfileResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java rename to server/src/main/java/org/elasticsearch/search/profile/ProfileResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java b/server/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java rename to server/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/Profilers.java b/server/src/main/java/org/elasticsearch/search/profile/Profilers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/Profilers.java rename to server/src/main/java/org/elasticsearch/search/profile/Profilers.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java b/server/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java rename to server/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/Timer.java b/server/src/main/java/org/elasticsearch/search/profile/Timer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/Timer.java rename to server/src/main/java/org/elasticsearch/search/profile/Timer.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/package-info.java b/server/src/main/java/org/elasticsearch/search/profile/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/package-info.java rename to server/src/main/java/org/elasticsearch/search/profile/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java b/server/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java rename to server/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java b/server/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java rename to server/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java b/server/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java rename to server/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java b/server/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java rename to server/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java b/server/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java rename to server/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java b/server/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java rename to server/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/package-info.java b/server/src/main/java/org/elasticsearch/search/profile/query/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/package-info.java rename to server/src/main/java/org/elasticsearch/search/profile/query/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/query/CancellableCollector.java b/server/src/main/java/org/elasticsearch/search/query/CancellableCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/CancellableCollector.java rename to server/src/main/java/org/elasticsearch/search/query/CancellableCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java b/server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java rename to server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java b/server/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java rename to server/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QueryPhase.java rename to server/src/main/java/org/elasticsearch/search/query/QueryPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java rename to server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java rename to server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java rename to server/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java b/server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java rename to server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java rename to server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java rename to server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java rename to server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java b/server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java rename to server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java rename to server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java b/server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java rename to server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java b/server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java rename to server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java b/server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java rename to server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java rename to server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java b/server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java rename to server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/SliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/SliceQuery.java rename to server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java rename to server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java b/server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java rename to server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortBuilders.java rename to server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java b/server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java rename to server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortMode.java b/server/src/main/java/org/elasticsearch/search/sort/SortMode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortMode.java rename to server/src/main/java/org/elasticsearch/search/sort/SortMode.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/server/src/main/java/org/elasticsearch/search/sort/SortOrder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortOrder.java rename to server/src/main/java/org/elasticsearch/search/sort/SortOrder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java b/server/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java rename to server/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java b/server/src/main/java/org/elasticsearch/search/suggest/SortBy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SortBy.java rename to server/src/main/java/org/elasticsearch/search/suggest/SortBy.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/server/src/main/java/org/elasticsearch/search/suggest/Suggest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/Suggest.java rename to server/src/main/java/org/elasticsearch/search/suggest/Suggest.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/Suggester.java b/server/src/main/java/org/elasticsearch/search/suggest/Suggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/Suggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/Suggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/term/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/package-info.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java b/server/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java rename to server/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java b/server/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java rename to server/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java rename to server/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/RestoreService.java rename to server/src/main/java/org/elasticsearch/snapshots/RestoreService.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/Snapshot.java b/server/src/main/java/org/elasticsearch/snapshots/Snapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/Snapshot.java rename to server/src/main/java/org/elasticsearch/snapshots/Snapshot.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotId.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotId.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotId.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotState.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotState.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotState.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java diff --git a/core/src/main/java/org/elasticsearch/tasks/CancellableTask.java b/server/src/main/java/org/elasticsearch/tasks/CancellableTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/CancellableTask.java rename to server/src/main/java/org/elasticsearch/tasks/CancellableTask.java diff --git a/core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java b/server/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java rename to server/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java diff --git a/core/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java b/server/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java rename to server/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java diff --git a/core/src/main/java/org/elasticsearch/tasks/Task.java b/server/src/main/java/org/elasticsearch/tasks/Task.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/Task.java rename to server/src/main/java/org/elasticsearch/tasks/Task.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java b/server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java rename to server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java b/server/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java rename to server/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskId.java b/server/src/main/java/org/elasticsearch/tasks/TaskId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskId.java rename to server/src/main/java/org/elasticsearch/tasks/TaskId.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskInfo.java b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskInfo.java rename to server/src/main/java/org/elasticsearch/tasks/TaskInfo.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskListener.java b/server/src/main/java/org/elasticsearch/tasks/TaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskListener.java rename to server/src/main/java/org/elasticsearch/tasks/TaskListener.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskManager.java b/server/src/main/java/org/elasticsearch/tasks/TaskManager.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskManager.java rename to server/src/main/java/org/elasticsearch/tasks/TaskManager.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskResult.java b/server/src/main/java/org/elasticsearch/tasks/TaskResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskResult.java rename to server/src/main/java/org/elasticsearch/tasks/TaskResult.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskResultsService.java b/server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskResultsService.java rename to server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java diff --git a/core/src/main/java/org/elasticsearch/tasks/package-info.java b/server/src/main/java/org/elasticsearch/tasks/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/package-info.java rename to server/src/main/java/org/elasticsearch/tasks/package-info.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/Scheduler.java b/server/src/main/java/org/elasticsearch/threadpool/Scheduler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/Scheduler.java rename to server/src/main/java/org/elasticsearch/threadpool/Scheduler.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java rename to server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java rename to server/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java rename to server/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java diff --git a/core/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ActionTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ActionTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/BindTransportException.java b/server/src/main/java/org/elasticsearch/transport/BindTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/BindTransportException.java rename to server/src/main/java/org/elasticsearch/transport/BindTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java b/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java rename to server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java diff --git a/core/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java b/server/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java rename to server/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java diff --git a/core/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ConnectTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/ConnectionProfile.java b/server/src/main/java/org/elasticsearch/transport/ConnectionProfile.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ConnectionProfile.java rename to server/src/main/java/org/elasticsearch/transport/ConnectionProfile.java diff --git a/core/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java b/server/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java rename to server/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java diff --git a/core/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java b/server/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java rename to server/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java diff --git a/core/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java b/server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java rename to server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java diff --git a/core/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java b/server/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java rename to server/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java b/server/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java rename to server/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java diff --git a/core/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java b/server/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java rename to server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java rename to server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterService.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteClusterService.java rename to server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java rename to server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteTransportException.java b/server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteTransportException.java rename to server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java b/server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java rename to server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java diff --git a/core/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java b/server/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java b/server/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java rename to server/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java b/server/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java rename to server/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java b/server/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java rename to server/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpChannel.java b/server/src/main/java/org/elasticsearch/transport/TcpChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpChannel.java rename to server/src/main/java/org/elasticsearch/transport/TcpChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpHeader.java b/server/src/main/java/org/elasticsearch/transport/TcpHeader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpHeader.java rename to server/src/main/java/org/elasticsearch/transport/TcpHeader.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpTransport.java b/server/src/main/java/org/elasticsearch/transport/TcpTransport.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpTransport.java rename to server/src/main/java/org/elasticsearch/transport/TcpTransport.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java b/server/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java rename to server/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/Transport.java b/server/src/main/java/org/elasticsearch/transport/Transport.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/Transport.java rename to server/src/main/java/org/elasticsearch/transport/Transport.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java b/server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java rename to server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportChannel.java b/server/src/main/java/org/elasticsearch/transport/TransportChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportChannel.java rename to server/src/main/java/org/elasticsearch/transport/TransportChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java b/server/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java rename to server/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportException.java b/server/src/main/java/org/elasticsearch/transport/TransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportException.java rename to server/src/main/java/org/elasticsearch/transport/TransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportFuture.java b/server/src/main/java/org/elasticsearch/transport/TransportFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportFuture.java rename to server/src/main/java/org/elasticsearch/transport/TransportFuture.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportInfo.java b/server/src/main/java/org/elasticsearch/transport/TransportInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportInfo.java rename to server/src/main/java/org/elasticsearch/transport/TransportInfo.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java b/server/src/main/java/org/elasticsearch/transport/TransportInterceptor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java rename to server/src/main/java/org/elasticsearch/transport/TransportInterceptor.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportMessage.java b/server/src/main/java/org/elasticsearch/transport/TransportMessage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportMessage.java rename to server/src/main/java/org/elasticsearch/transport/TransportMessage.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequest.java b/server/src/main/java/org/elasticsearch/transport/TransportRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportRequest.java rename to server/src/main/java/org/elasticsearch/transport/TransportRequest.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java b/server/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java rename to server/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java b/server/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java rename to server/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportResponse.java b/server/src/main/java/org/elasticsearch/transport/TransportResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportResponse.java rename to server/src/main/java/org/elasticsearch/transport/TransportResponse.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java b/server/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java rename to server/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportSerializationException.java b/server/src/main/java/org/elasticsearch/transport/TransportSerializationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportSerializationException.java rename to server/src/main/java/org/elasticsearch/transport/TransportSerializationException.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportService.java rename to server/src/main/java/org/elasticsearch/transport/TransportService.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportStats.java b/server/src/main/java/org/elasticsearch/transport/TransportStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportStats.java rename to server/src/main/java/org/elasticsearch/transport/TransportStats.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportStatus.java b/server/src/main/java/org/elasticsearch/transport/TransportStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportStatus.java rename to server/src/main/java/org/elasticsearch/transport/TransportStatus.java diff --git a/core/src/main/java/org/elasticsearch/transport/Transports.java b/server/src/main/java/org/elasticsearch/transport/Transports.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/Transports.java rename to server/src/main/java/org/elasticsearch/transport/Transports.java diff --git a/core/src/main/java/org/elasticsearch/usage/UsageService.java b/server/src/main/java/org/elasticsearch/usage/UsageService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/usage/UsageService.java rename to server/src/main/java/org/elasticsearch/usage/UsageService.java diff --git a/core/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java b/server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java rename to server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java diff --git a/core/src/main/java/org/elasticsearch/watcher/FileChangesListener.java b/server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/FileChangesListener.java rename to server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java diff --git a/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java b/server/src/main/java/org/elasticsearch/watcher/FileWatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/FileWatcher.java rename to server/src/main/java/org/elasticsearch/watcher/FileWatcher.java diff --git a/core/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java rename to server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java diff --git a/core/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java rename to server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java diff --git a/core/src/main/java/org/elasticsearch/watcher/WatcherHandle.java b/server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/WatcherHandle.java rename to server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java diff --git a/core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java b/server/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java similarity index 100% rename from core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java rename to server/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java diff --git a/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec similarity index 100% rename from core/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec rename to server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec diff --git a/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat similarity index 100% rename from core/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat rename to server/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat diff --git a/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat similarity index 100% rename from core/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat rename to server/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat diff --git a/core/src/main/resources/config/favicon.ico b/server/src/main/resources/config/favicon.ico similarity index 100% rename from core/src/main/resources/config/favicon.ico rename to server/src/main/resources/config/favicon.ico diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/server/src/main/resources/org/elasticsearch/bootstrap/security.policy similarity index 100% rename from core/src/main/resources/org/elasticsearch/bootstrap/security.policy rename to server/src/main/resources/org/elasticsearch/bootstrap/security.policy diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy similarity index 100% rename from core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy rename to server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy b/server/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy similarity index 100% rename from core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy rename to server/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy diff --git a/core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json b/server/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json similarity index 100% rename from core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json rename to server/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json diff --git a/core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json b/server/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json similarity index 100% rename from core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json rename to server/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json diff --git a/core/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json b/server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json similarity index 100% rename from core/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json rename to server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json diff --git a/core/src/test/eclipse-build.gradle b/server/src/test/eclipse-build.gradle similarity index 81% rename from core/src/test/eclipse-build.gradle rename to server/src/test/eclipse-build.gradle index f180aec428757..dd380e342b638 100644 --- a/core/src/test/eclipse-build.gradle +++ b/server/src/test/eclipse-build.gradle @@ -3,5 +3,5 @@ apply from: '../../build.gradle' dependencies { - testCompile project(':core') + testCompile project(':server') } diff --git a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java rename to server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java diff --git a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java rename to server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java diff --git a/core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java b/server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java rename to server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java b/server/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java rename to server/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java diff --git a/core/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java b/server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java b/server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java b/server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/search/QueriesTests.java b/server/src/test/java/org/apache/lucene/search/QueriesTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/QueriesTests.java rename to server/src/test/java/org/apache/lucene/search/QueriesTests.java diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java rename to server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java rename to server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java rename to server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java diff --git a/core/src/test/java/org/elasticsearch/BuildTests.java b/server/src/test/java/org/elasticsearch/BuildTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/BuildTests.java rename to server/src/test/java/org/elasticsearch/BuildTests.java diff --git a/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java b/server/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java rename to server/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java rename to server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/SpecialPermissionTests.java b/server/src/test/java/org/elasticsearch/SpecialPermissionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/SpecialPermissionTests.java rename to server/src/test/java/org/elasticsearch/SpecialPermissionTests.java diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/server/src/test/java/org/elasticsearch/VersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/VersionTests.java rename to server/src/test/java/org/elasticsearch/VersionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/ActionListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ActionListenerTests.java rename to server/src/test/java/org/elasticsearch/action/ActionListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ActionModuleTests.java b/server/src/test/java/org/elasticsearch/action/ActionModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ActionModuleTests.java rename to server/src/test/java/org/elasticsearch/action/ActionModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java b/server/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java rename to server/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ExplainRequestTests.java b/server/src/test/java/org/elasticsearch/action/ExplainRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ExplainRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ExplainRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java b/server/src/test/java/org/elasticsearch/action/IndicesRequestIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java rename to server/src/test/java/org/elasticsearch/action/IndicesRequestIT.java diff --git a/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java b/server/src/test/java/org/elasticsearch/action/ListenerActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ListenerActionIT.java rename to server/src/test/java/org/elasticsearch/action/ListenerActionIT.java diff --git a/core/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java b/server/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java rename to server/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java b/server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java rename to server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java b/server/src/test/java/org/elasticsearch/action/RejectionActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/RejectionActionIT.java rename to server/src/test/java/org/elasticsearch/action/RejectionActionIT.java diff --git a/core/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java b/server/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java b/server/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java rename to server/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/RetryTests.java b/server/src/test/java/org/elasticsearch/action/bulk/RetryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/RetryTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/RetryTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java b/server/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java rename to server/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java rename to server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java rename to server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java rename to server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/get/GetResponseTests.java b/server/src/test/java/org/elasticsearch/action/get/GetResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/get/GetResponseTests.java rename to server/src/test/java/org/elasticsearch/action/get/GetResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java rename to server/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java rename to server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java rename to server/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java rename to server/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java b/server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java b/server/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java b/server/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java b/server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java diff --git a/core/src/test/java/org/elasticsearch/action/main/MainActionTests.java b/server/src/test/java/org/elasticsearch/action/main/MainActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/main/MainActionTests.java rename to server/src/test/java/org/elasticsearch/action/main/MainActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/main/MainResponseTests.java b/server/src/test/java/org/elasticsearch/action/main/MainResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/main/MainResponseTests.java rename to server/src/test/java/org/elasticsearch/action/main/MainResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java b/server/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java rename to server/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java rename to server/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java rename to server/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java b/server/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java rename to server/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java b/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java rename to server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java rename to server/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java b/server/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java rename to server/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java b/server/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java rename to server/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java rename to server/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java rename to server/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java b/server/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java rename to server/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java b/server/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java rename to server/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java b/server/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java rename to server/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java b/server/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java rename to server/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java rename to server/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java rename to server/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java b/server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java rename to server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java b/server/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java rename to server/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java b/server/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java rename to server/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java rename to server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java b/server/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java rename to server/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java b/server/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java rename to server/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java rename to server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java diff --git a/core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java b/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java b/server/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java rename to server/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java rename to server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java b/server/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java rename to server/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java b/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java rename to server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java b/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java rename to server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java b/server/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java rename to server/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java b/server/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java rename to server/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java rename to server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java b/server/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java rename to server/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java rename to server/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java diff --git a/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java rename to server/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java b/server/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java b/server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java b/server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java b/server/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java b/server/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java b/server/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java b/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java b/server/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java diff --git a/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java b/server/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java rename to server/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java b/server/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java rename to server/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java b/server/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java rename to server/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java diff --git a/core/src/test/java/org/elasticsearch/cli/CommandTests.java b/server/src/test/java/org/elasticsearch/cli/CommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cli/CommandTests.java rename to server/src/test/java/org/elasticsearch/cli/CommandTests.java diff --git a/core/src/test/java/org/elasticsearch/cli/MultiCommandTests.java b/server/src/test/java/org/elasticsearch/cli/MultiCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cli/MultiCommandTests.java rename to server/src/test/java/org/elasticsearch/cli/MultiCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/cli/TerminalTests.java b/server/src/test/java/org/elasticsearch/cli/TerminalTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cli/TerminalTests.java rename to server/src/test/java/org/elasticsearch/cli/TerminalTests.java diff --git a/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java b/server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java rename to server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java diff --git a/core/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java b/server/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java rename to server/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java diff --git a/core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java b/server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java rename to server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java diff --git a/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java b/server/src/test/java/org/elasticsearch/client/node/NodeClientIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java rename to server/src/test/java/org/elasticsearch/client/node/NodeClientIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java b/server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java rename to server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java b/server/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java rename to server/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java rename to server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java rename to server/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java rename to server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java b/server/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java rename to server/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java b/server/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java rename to server/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java b/server/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java rename to server/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java b/server/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java rename to server/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java rename to server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java b/server/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java rename to server/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java rename to server/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java b/server/src/test/java/org/elasticsearch/cluster/ack/AckIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java rename to server/src/test/java/org/elasticsearch/cluster/ack/AckIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java rename to server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java rename to server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java rename to server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java rename to server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java rename to server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java rename to server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java rename to server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java rename to server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java b/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java rename to server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java rename to server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java rename to server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java rename to server/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java rename to server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java b/server/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java rename to server/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java b/server/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java rename to server/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java rename to server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/BooleansTests.java b/server/src/test/java/org/elasticsearch/common/BooleansTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/BooleansTests.java rename to server/src/test/java/org/elasticsearch/common/BooleansTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ChannelsTests.java b/server/src/test/java/org/elasticsearch/common/ChannelsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ChannelsTests.java rename to server/src/test/java/org/elasticsearch/common/ChannelsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java b/server/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java rename to server/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java diff --git a/core/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java b/server/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java rename to server/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/NumbersTests.java b/server/src/test/java/org/elasticsearch/common/NumbersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/NumbersTests.java rename to server/src/test/java/org/elasticsearch/common/NumbersTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java b/server/src/test/java/org/elasticsearch/common/ParseFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ParseFieldTests.java rename to server/src/test/java/org/elasticsearch/common/ParseFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/common/PidFileTests.java b/server/src/test/java/org/elasticsearch/common/PidFileTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/PidFileTests.java rename to server/src/test/java/org/elasticsearch/common/PidFileTests.java diff --git a/core/src/test/java/org/elasticsearch/common/PriorityTests.java b/server/src/test/java/org/elasticsearch/common/PriorityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/PriorityTests.java rename to server/src/test/java/org/elasticsearch/common/PriorityTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ReleasablesTests.java b/server/src/test/java/org/elasticsearch/common/ReleasablesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ReleasablesTests.java rename to server/src/test/java/org/elasticsearch/common/ReleasablesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/StringsTests.java b/server/src/test/java/org/elasticsearch/common/StringsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/StringsTests.java rename to server/src/test/java/org/elasticsearch/common/StringsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/TableTests.java b/server/src/test/java/org/elasticsearch/common/TableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/TableTests.java rename to server/src/test/java/org/elasticsearch/common/TableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/UUIDTests.java b/server/src/test/java/org/elasticsearch/common/UUIDTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/UUIDTests.java rename to server/src/test/java/org/elasticsearch/common/UUIDTests.java diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java rename to server/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java rename to server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java rename to server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java b/server/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java rename to server/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java b/server/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java b/server/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java b/server/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java b/server/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/cache/CacheTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/cache/CacheTests.java rename to server/src/test/java/org/elasticsearch/common/cache/CacheTests.java diff --git a/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java b/server/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java rename to server/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java diff --git a/core/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java b/server/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java rename to server/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java b/server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java rename to server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java b/server/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java rename to server/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java diff --git a/core/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java b/server/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java rename to server/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java b/server/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java rename to server/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java b/server/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java rename to server/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java b/server/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java rename to server/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java b/server/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java b/server/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java rename to server/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java b/server/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java rename to server/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java diff --git a/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java b/server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java rename to server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java b/server/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/StreamsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/StreamsTests.java rename to server/src/test/java/org/elasticsearch/common/io/StreamsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java b/server/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java rename to server/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java diff --git a/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java b/server/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java rename to server/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/joda/JodaTests.java b/server/src/test/java/org/elasticsearch/common/joda/JodaTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/joda/JodaTests.java rename to server/src/test/java/org/elasticsearch/common/joda/JodaTests.java diff --git a/core/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java b/server/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java rename to server/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java b/server/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java b/server/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java b/server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java b/server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java b/server/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java b/server/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java b/server/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java b/server/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/CidrsTests.java b/server/src/test/java/org/elasticsearch/common/network/CidrsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/CidrsTests.java rename to server/src/test/java/org/elasticsearch/common/network/CidrsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java b/server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java rename to server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java b/server/src/test/java/org/elasticsearch/common/path/PathTrieTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java rename to server/src/test/java/org/elasticsearch/common/path/PathTrieTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java b/server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java rename to server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java b/server/src/test/java/org/elasticsearch/common/regex/RegexTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/regex/RegexTests.java rename to server/src/test/java/org/elasticsearch/common/regex/RegexTests.java diff --git a/core/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java b/server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java rename to server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java b/server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java rename to server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java b/server/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java rename to server/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java b/server/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java rename to server/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java rename to server/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java b/server/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java rename to server/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java rename to server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java b/server/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java b/server/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java rename to server/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java b/server/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java rename to server/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java b/server/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java rename to server/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java b/server/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java rename to server/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java b/server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java rename to server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java b/server/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java rename to server/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java b/server/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java rename to server/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java b/server/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java rename to server/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java b/server/src/test/java/org/elasticsearch/common/util/LongHashTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/LongHashTests.java rename to server/src/test/java/org/elasticsearch/common/util/LongHashTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java b/server/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java rename to server/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java b/server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java rename to server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java b/server/src/test/java/org/elasticsearch/common/util/URIPatternTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java rename to server/src/test/java/org/elasticsearch/common/util/URIPatternTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java b/server/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java rename to server/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/set/SetsTests.java b/server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/set/SetsTests.java rename to server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java rename to server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java b/server/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java rename to server/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/server/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java rename to server/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java b/server/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java rename to server/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/server/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java rename to server/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java b/server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java rename to server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java diff --git a/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java b/server/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java rename to server/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java b/server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java rename to server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java rename to server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java b/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java rename to server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java b/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java rename to server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java diff --git a/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java b/server/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java rename to server/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java diff --git a/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java b/server/src/test/java/org/elasticsearch/document/DocumentActionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java rename to server/src/test/java/org/elasticsearch/document/DocumentActionsIT.java diff --git a/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java b/server/src/test/java/org/elasticsearch/document/ShardInfoIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/document/ShardInfoIT.java rename to server/src/test/java/org/elasticsearch/document/ShardInfoIT.java diff --git a/core/src/test/java/org/elasticsearch/env/ESFileStoreTests.java b/server/src/test/java/org/elasticsearch/env/ESFileStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/env/ESFileStoreTests.java rename to server/src/test/java/org/elasticsearch/env/ESFileStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/EnvironmentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/env/EnvironmentTests.java rename to server/src/test/java/org/elasticsearch/env/EnvironmentTests.java diff --git a/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java rename to server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java diff --git a/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java b/server/src/test/java/org/elasticsearch/explain/ExplainActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java rename to server/src/test/java/org/elasticsearch/explain/ExplainActionIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/server/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java rename to server/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java b/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java rename to server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/server/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java rename to server/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java rename to server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java rename to server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java b/server/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java rename to server/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java b/server/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java rename to server/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java rename to server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java b/server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java rename to server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java b/server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java rename to server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java b/server/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java rename to server/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java b/server/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java rename to server/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/server/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java rename to server/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java b/server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java rename to server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java b/server/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java rename to server/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java diff --git a/core/src/test/java/org/elasticsearch/get/GetActionIT.java b/server/src/test/java/org/elasticsearch/get/GetActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/get/GetActionIT.java rename to server/src/test/java/org/elasticsearch/get/GetActionIT.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexModuleTests.java rename to server/src/test/java/org/elasticsearch/index/IndexModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java b/server/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java rename to server/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexServiceTests.java rename to server/src/test/java/org/elasticsearch/index/IndexServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexSortIT.java b/server/src/test/java/org/elasticsearch/index/IndexSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexSortIT.java rename to server/src/test/java/org/elasticsearch/index/IndexSortIT.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexTests.java b/server/src/test/java/org/elasticsearch/index/IndexTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexTests.java rename to server/src/test/java/org/elasticsearch/index/IndexTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java rename to server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java diff --git a/core/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java rename to server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java rename to server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java diff --git a/core/src/test/java/org/elasticsearch/index/SettingsListenerIT.java b/server/src/test/java/org/elasticsearch/index/SettingsListenerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/SettingsListenerIT.java rename to server/src/test/java/org/elasticsearch/index/SettingsListenerIT.java diff --git a/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java b/server/src/test/java/org/elasticsearch/index/VersionTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/VersionTypeTests.java rename to server/src/test/java/org/elasticsearch/index/VersionTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java b/server/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java rename to server/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java b/server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java b/server/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java diff --git a/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java b/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java rename to server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/codec/CodecTests.java rename to server/src/test/java/org/elasticsearch/index/codec/CodecTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java rename to server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java b/server/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java rename to server/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java rename to server/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java rename to server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java rename to server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/SegmentTests.java b/server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/SegmentTests.java rename to server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java rename to server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java rename to server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java diff --git a/core/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java b/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java rename to server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/index/get/GetResultTests.java b/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/get/GetResultTests.java rename to server/src/test/java/org/elasticsearch/index/get/GetResultTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/AllFieldIT.java b/server/src/test/java/org/elasticsearch/index/mapper/AllFieldIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/AllFieldIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/AllFieldIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/AllFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/AllFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/AllFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/AllFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java b/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java rename to server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldIncludeInAllMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldIncludeInAllMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldIncludeInAllMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldIncludeInAllMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UidTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UidTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/package-info.java b/server/src/test/java/org/elasticsearch/index/mapper/package-info.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/package-info.java rename to server/src/test/java/org/elasticsearch/index/mapper/package-info.java diff --git a/core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java b/server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java rename to server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java b/server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java rename to server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java rename to server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java b/server/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java rename to server/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java b/server/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java rename to server/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/OperatorTests.java b/server/src/test/java/org/elasticsearch/index/query/OperatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/OperatorTests.java rename to server/src/test/java/org/elasticsearch/index/query/OperatorTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java rename to server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java b/server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java rename to server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java rename to server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RewriteableTests.java b/server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RewriteableTests.java rename to server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java b/server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java rename to server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java b/server/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java rename to server/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java b/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java rename to server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java b/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java rename to server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java diff --git a/core/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java b/server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java rename to server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java b/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java rename to server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java rename to server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java rename to server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java diff --git a/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java rename to server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java b/server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java rename to server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java b/server/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java rename to server/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java b/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java rename to server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java b/server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java rename to server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java rename to server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java rename to server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java b/server/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java rename to server/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java b/server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java rename to server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java b/server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java b/server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java rename to server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/EngineAccess.java b/server/src/test/java/org/elasticsearch/index/shard/EngineAccess.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/EngineAccess.java rename to server/src/test/java/org/elasticsearch/index/shard/EngineAccess.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java rename to server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java b/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java rename to server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java rename to server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java rename to server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java rename to server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java rename to server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java diff --git a/core/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java rename to server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java rename to server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java rename to server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java rename to server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java rename to server/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java b/server/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java rename to server/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java diff --git a/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java b/server/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java rename to server/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java b/server/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java rename to server/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java diff --git a/core/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java b/server/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java rename to server/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java b/server/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java rename to server/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/StoreTests.java b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/StoreTests.java rename to server/src/test/java/org/elasticsearch/index/store/StoreTests.java diff --git a/core/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java b/server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java rename to server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java b/server/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java rename to server/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java b/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java rename to server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java rename to server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java b/server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java rename to server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TestTranslog.java b/server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TestTranslog.java rename to server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java rename to server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java rename to server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java rename to server/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java b/server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java rename to server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java diff --git a/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java b/server/src/test/java/org/elasticsearch/indexing/IndexActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java rename to server/src/test/java/org/elasticsearch/indexing/IndexActionIT.java diff --git a/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java b/server/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java rename to server/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java b/server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java rename to server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java rename to server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java rename to server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java b/server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java rename to server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/TermsLookupTests.java b/server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/TermsLookupTests.java rename to server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java rename to server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java b/server/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java rename to server/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java rename to server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java rename to server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java b/server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java rename to server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java b/server/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java rename to server/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java b/server/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java rename to server/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java b/server/src/test/java/org/elasticsearch/indices/flush/FlushIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java rename to server/src/test/java/org/elasticsearch/indices/flush/FlushIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java rename to server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java rename to server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java b/server/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java rename to server/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/server/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java rename to server/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java b/server/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java rename to server/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java b/server/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java rename to server/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/server/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java rename to server/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java b/server/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java rename to server/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/server/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java rename to server/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java b/server/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java rename to server/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java b/server/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java rename to server/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/server/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java rename to server/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java b/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java rename to server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java b/server/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java rename to server/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java b/server/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java rename to server/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java diff --git a/core/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java b/server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java rename to server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java b/server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java rename to server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java rename to server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java b/server/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java rename to server/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java b/server/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java rename to server/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java diff --git a/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java b/server/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java rename to server/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java diff --git a/core/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java rename to server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java rename to server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java rename to server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java rename to server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java rename to server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java diff --git a/core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java b/server/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java rename to server/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java diff --git a/core/src/test/java/org/elasticsearch/node/NodeTests.java b/server/src/test/java/org/elasticsearch/node/NodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/NodeTests.java rename to server/src/test/java/org/elasticsearch/node/NodeTests.java diff --git a/core/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java b/server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java rename to server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java b/server/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java rename to server/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java b/server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java rename to server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java diff --git a/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java b/server/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java rename to server/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java diff --git a/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java b/server/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java rename to server/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java diff --git a/core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java b/server/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java rename to server/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java rename to server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java rename to server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginsTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/PluginsTests.java rename to server/src/test/java/org/elasticsearch/plugins/PluginsTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java b/server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java rename to server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java diff --git a/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/server/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java rename to server/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java rename to server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/server/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java rename to server/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/test/java/org/elasticsearch/recovery/RelocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/RelocationIT.java rename to server/src/test/java/org/elasticsearch/recovery/RelocationIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java b/server/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java rename to server/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java b/server/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java rename to server/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/repositories/IndexIdTests.java b/server/src/test/java/org/elasticsearch/repositories/IndexIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/IndexIdTests.java rename to server/src/test/java/org/elasticsearch/repositories/IndexIdTests.java diff --git a/core/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java b/server/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java rename to server/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java diff --git a/core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java rename to server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java diff --git a/core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java rename to server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java b/server/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java rename to server/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java rename to server/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java b/server/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java rename to server/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestControllerTests.java b/server/src/test/java/org/elasticsearch/rest/RestControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestControllerTests.java rename to server/src/test/java/org/elasticsearch/rest/RestControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java b/server/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java rename to server/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java b/server/src/test/java/org/elasticsearch/rest/RestRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestRequestTests.java rename to server/src/test/java/org/elasticsearch/rest/RestRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestUtilsTests.java b/server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestUtilsTests.java rename to server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java b/server/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java rename to server/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java b/server/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java rename to server/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java b/server/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java rename to server/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java diff --git a/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/script/ClassPermissionTests.java b/server/src/test/java/org/elasticsearch/script/ClassPermissionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ClassPermissionTests.java rename to server/src/test/java/org/elasticsearch/script/ClassPermissionTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptContextTests.java b/server/src/test/java/org/elasticsearch/script/ScriptContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptContextTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptContextTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java b/server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java b/server/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptTests.java b/server/src/test/java/org/elasticsearch/script/ScriptTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptTests.java diff --git a/core/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java b/server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java rename to server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java diff --git a/core/src/test/java/org/elasticsearch/script/StoredScriptTests.java b/server/src/test/java/org/elasticsearch/script/StoredScriptTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/StoredScriptTests.java rename to server/src/test/java/org/elasticsearch/script/StoredScriptTests.java diff --git a/core/src/test/java/org/elasticsearch/script/StoredScriptsIT.java b/server/src/test/java/org/elasticsearch/script/StoredScriptsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/StoredScriptsIT.java rename to server/src/test/java/org/elasticsearch/script/StoredScriptsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java rename to server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java b/server/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java rename to server/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/DocValueFormatTests.java b/server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/DocValueFormatTests.java rename to server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java diff --git a/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java rename to server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java b/server/src/test/java/org/elasticsearch/search/NestedIdentityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java rename to server/src/test/java/org/elasticsearch/search/NestedIdentityTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java b/server/src/test/java/org/elasticsearch/search/SearchCancellationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java rename to server/src/test/java/org/elasticsearch/search/SearchCancellationIT.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationTests.java b/server/src/test/java/org/elasticsearch/search/SearchCancellationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchCancellationTests.java rename to server/src/test/java/org/elasticsearch/search/SearchCancellationTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchHitTests.java b/server/src/test/java/org/elasticsearch/search/SearchHitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchHitTests.java rename to server/src/test/java/org/elasticsearch/search/SearchHitTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchHitsTests.java b/server/src/test/java/org/elasticsearch/search/SearchHitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchHitsTests.java rename to server/src/test/java/org/elasticsearch/search/SearchHitsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java b/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchModuleTests.java rename to server/src/test/java/org/elasticsearch/search/SearchModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/SearchRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchRequestTests.java rename to server/src/test/java/org/elasticsearch/search/SearchRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchServiceTests.java rename to server/src/test/java/org/elasticsearch/search/SearchServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java b/server/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java rename to server/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java b/server/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java rename to server/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java b/server/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java rename to server/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java rename to server/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java b/server/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java rename to server/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java b/server/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java rename to server/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java b/server/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java rename to server/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java b/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java b/server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java b/server/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java rename to server/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java b/server/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java b/server/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java rename to server/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java b/server/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java rename to server/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java rename to server/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java b/server/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java rename to server/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java diff --git a/core/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java b/server/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java rename to server/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java b/server/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java rename to server/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java diff --git a/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java b/server/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java rename to server/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java b/server/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java rename to server/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/TimerTests.java b/server/src/test/java/org/elasticsearch/search/profile/TimerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/TimerTests.java rename to server/src/test/java/org/elasticsearch/search/profile/TimerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java b/server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java rename to server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java b/server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java rename to server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java b/server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java rename to server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java b/server/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java rename to server/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java diff --git a/core/src/test/java/org/elasticsearch/search/query/ExistsIT.java b/server/src/test/java/org/elasticsearch/search/query/ExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/ExistsIT.java rename to server/src/test/java/org/elasticsearch/search/query/ExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java b/server/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java rename to server/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java rename to server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java b/server/src/test/java/org/elasticsearch/search/query/QueryStringIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java rename to server/src/test/java/org/elasticsearch/search/query/QueryStringIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java b/server/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java rename to server/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java b/server/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java rename to server/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java rename to server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java b/server/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java rename to server/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java b/server/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java rename to server/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java b/server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java rename to server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java b/server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java rename to server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/server/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java rename to server/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java b/server/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java rename to server/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java b/server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java b/server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java rename to server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java diff --git a/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java b/server/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java rename to server/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java b/server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java rename to server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java b/server/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java rename to server/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java b/server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java rename to server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java b/server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java rename to server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java b/server/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java rename to server/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java rename to server/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java rename to server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java b/server/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java rename to server/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortModeTests.java b/server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SortModeTests.java rename to server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java b/server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java b/server/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java rename to server/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java b/server/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java rename to server/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java rename to server/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java b/server/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java rename to server/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java b/server/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java rename to server/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java b/server/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java rename to server/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java b/server/src/test/java/org/elasticsearch/similarity/SimilarityIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java rename to server/src/test/java/org/elasticsearch/similarity/SimilarityIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java b/server/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java rename to server/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java b/server/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java rename to server/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/server/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java rename to server/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java b/server/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java rename to server/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java b/server/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java rename to server/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java rename to server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java rename to server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java rename to server/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java b/server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java rename to server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java b/server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java rename to server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/server/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java rename to server/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java diff --git a/core/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java b/server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java rename to server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/tasks/TaskIdTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/tasks/TaskIdTests.java rename to server/src/test/java/org/elasticsearch/tasks/TaskIdTests.java diff --git a/core/src/test/java/org/elasticsearch/tasks/TaskResultTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/tasks/TaskResultTests.java rename to server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java diff --git a/core/src/test/java/org/elasticsearch/test/NoopDiscovery.java b/server/src/test/java/org/elasticsearch/test/NoopDiscovery.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/NoopDiscovery.java rename to server/src/test/java/org/elasticsearch/test/NoopDiscovery.java diff --git a/core/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java b/server/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java rename to server/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java diff --git a/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java b/server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java rename to server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java diff --git a/core/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java b/server/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java rename to server/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java diff --git a/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java b/server/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java rename to server/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java diff --git a/core/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java b/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java rename to server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java b/server/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java rename to server/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java b/server/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java rename to server/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java rename to server/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java b/server/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java b/server/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java rename to server/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java b/server/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java b/server/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/server/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java rename to server/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java b/server/src/test/java/org/elasticsearch/transport/ActionNamesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java rename to server/src/test/java/org/elasticsearch/transport/ActionNamesIT.java diff --git a/core/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java b/server/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java rename to server/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java b/server/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java rename to server/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/PublishPortTests.java b/server/src/test/java/org/elasticsearch/transport/PublishPortTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/PublishPortTests.java rename to server/src/test/java/org/elasticsearch/transport/PublishPortTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java rename to server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java rename to server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java b/server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java rename to server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java rename to server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java rename to server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java diff --git a/core/src/test/java/org/elasticsearch/update/UpdateIT.java b/server/src/test/java/org/elasticsearch/update/UpdateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/update/UpdateIT.java rename to server/src/test/java/org/elasticsearch/update/UpdateIT.java diff --git a/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java b/server/src/test/java/org/elasticsearch/update/UpdateNoopIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java rename to server/src/test/java/org/elasticsearch/update/UpdateNoopIT.java diff --git a/core/src/test/java/org/elasticsearch/usage/UsageServiceTests.java b/server/src/test/java/org/elasticsearch/usage/UsageServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/usage/UsageServiceTests.java rename to server/src/test/java/org/elasticsearch/usage/UsageServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java b/server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java rename to server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/server/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java rename to server/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/server/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java rename to server/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java diff --git a/core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java b/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java rename to server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java diff --git a/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java rename to server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java diff --git a/core/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider b/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider similarity index 100% rename from core/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider rename to server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider diff --git a/core/src/test/resources/config/elasticsearch.json b/server/src/test/resources/config/elasticsearch.json similarity index 100% rename from core/src/test/resources/config/elasticsearch.json rename to server/src/test/resources/config/elasticsearch.json diff --git a/core/src/test/resources/config/elasticsearch.yml b/server/src/test/resources/config/elasticsearch.yml similarity index 100% rename from core/src/test/resources/config/elasticsearch.yml rename to server/src/test/resources/config/elasticsearch.yml diff --git a/core/src/test/resources/config/garbage/garbage.yml b/server/src/test/resources/config/garbage/garbage.yml similarity index 100% rename from core/src/test/resources/config/garbage/garbage.yml rename to server/src/test/resources/config/garbage/garbage.yml diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml diff --git a/core/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic b/server/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic rename to server/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic diff --git a/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff b/server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff similarity index 100% rename from core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff rename to server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff diff --git a/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff b/server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff similarity index 100% rename from core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff rename to server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff diff --git a/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic b/server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic rename to server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic diff --git a/core/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip b/server/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip rename to server/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.20.6.zip b/server/src/test/resources/indices/bwc/unsupported-0.20.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.20.6.zip rename to server/src/test/resources/indices/bwc/unsupported-0.20.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.1.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.1.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.10.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.10.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.10.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.10.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.11.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.11.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.11.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.11.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.12.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.12.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.12.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.12.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.13.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.13.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.13.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.13.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.2.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.2.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.3.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.3.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.4.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.4.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.5.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.5.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.6.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.6.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.7.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.7.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.7.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.7.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.8.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.8.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.8.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.8.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.9.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.9.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.9.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.9.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.1.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.1.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.1.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.1.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.1.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.1.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.5.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.5.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.6.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.6.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.7.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.7.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.7.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.7.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.8.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.8.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.8.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.8.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.9.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.9.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.9.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.9.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.5.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.5.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.5.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.5.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.5.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.5.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.5.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.5.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.5.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.5.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.5.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.5.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.5.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.5.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.6.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.6.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.6.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.6.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.6.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.6.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.6.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.6.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.6.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.6.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.6.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.6.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.5.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.5.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.1.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.1.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.1.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.1.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.1.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.1.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.2.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.2.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.2.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.2.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.2.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.2.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.3.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.3.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.4.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.4.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.5.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.5.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.3.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.3.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.5.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.5.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json b/server/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json rename to server/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json diff --git a/core/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json b/server/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json rename to server/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json diff --git a/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json b/server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json rename to server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json diff --git a/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json b/server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json rename to server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json diff --git a/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json b/server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json rename to server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json diff --git a/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar b/server/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar rename to server/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar diff --git a/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar b/server/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar rename to server/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar diff --git a/core/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip b/server/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip rename to server/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml b/server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml rename to server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml b/server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml rename to server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json b/server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json rename to server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml b/server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml rename to server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml diff --git a/core/src/test/resources/org/elasticsearch/gateway/global-3.st b/server/src/test/resources/org/elasticsearch/gateway/global-3.st similarity index 100% rename from core/src/test/resources/org/elasticsearch/gateway/global-3.st rename to server/src/test/resources/org/elasticsearch/gateway/global-3.st diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json b/server/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json rename to server/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/stop.json b/server/src/test/resources/org/elasticsearch/index/analysis/stop.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/stop.json rename to server/src/test/resources/org/elasticsearch/index/analysis/stop.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json b/server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json rename to server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt b/server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt rename to server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt b/server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt rename to server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/test1.json b/server/src/test/resources/org/elasticsearch/index/analysis/test1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/test1.json rename to server/src/test/resources/org/elasticsearch/index/analysis/test1.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/test1.yml b/server/src/test/resources/org/elasticsearch/index/analysis/test1.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/test1.yml rename to server/src/test/resources/org/elasticsearch/index/analysis/test1.yml diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json b/server/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json rename to server/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json b/server/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json rename to server/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json b/server/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json rename to server/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json b/server/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json rename to server/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json b/server/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json rename to server/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary diff --git a/core/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar b/server/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar rename to server/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar diff --git a/core/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar b/server/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar rename to server/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar diff --git a/core/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz b/server/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz rename to server/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz diff --git a/core/src/test/resources/org/elasticsearch/search/query/all-example-document.json b/server/src/test/resources/org/elasticsearch/search/query/all-example-document.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/query/all-example-document.json rename to server/src/test/resources/org/elasticsearch/search/query/all-example-document.json diff --git a/core/src/test/resources/org/elasticsearch/search/query/all-query-index-with-all.json b/server/src/test/resources/org/elasticsearch/search/query/all-query-index-with-all.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/query/all-query-index-with-all.json rename to server/src/test/resources/org/elasticsearch/search/query/all-query-index-with-all.json diff --git a/core/src/test/resources/org/elasticsearch/search/query/all-query-index.json b/server/src/test/resources/org/elasticsearch/search/query/all-query-index.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/query/all-query-index.json rename to server/src/test/resources/org/elasticsearch/search/query/all-query-index.json diff --git a/settings.gradle b/settings.gradle index 9a86fe5c762c8..be1e6c7c45d64 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,8 +4,6 @@ rootProject.name = dirName List projects = [ 'build-tools', 'rest-api-spec', - 'core', - 'core:cli', 'docs', 'client:rest', 'client:rest-high-level', @@ -22,6 +20,8 @@ List projects = [ 'distribution:rpm', 'distribution:tools:launchers', 'distribution:tools:plugin-cli', + 'server', + 'server:cli', 'test:framework', 'test:fixtures:example-fixture', 'test:fixtures:hdfs-fixture', @@ -105,8 +105,8 @@ for (final String branch : branches) { boolean isEclipse = System.getProperty("eclipse.launcher") != null || gradle.startParameter.taskNames.contains('eclipse') || gradle.startParameter.taskNames.contains('cleanEclipse') if (isEclipse) { // eclipse cannot handle an intermediate dependency between main and test, so we must create separate projects - // for core-src and core-tests - projects << 'core-tests' + // for server-src and server-tests + projects << 'server-tests' } include projects.toArray(new String[0]) @@ -120,10 +120,10 @@ for (final String branch : branches) { } if (isEclipse) { - project(":core").projectDir = new File(rootProject.projectDir, 'core/src/main') - project(":core").buildFileName = 'eclipse-build.gradle' - project(":core-tests").projectDir = new File(rootProject.projectDir, 'core/src/test') - project(":core-tests").buildFileName = 'eclipse-build.gradle' + project(":server").projectDir = new File(rootProject.projectDir, 'server/src/main') + project(":server").buildFileName = 'eclipse-build.gradle' + project(":server-tests").projectDir = new File(rootProject.projectDir, 'server/src/test') + project(":server-tests").buildFileName = 'eclipse-build.gradle' } /**