From a8fd2d48b8f3f17d68ed27c3104e2c9e2eb6cc9c Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Tue, 6 Dec 2011 00:58:16 +0200 Subject: [PATCH] first cleanup phase, move to single src --- .idea/modules.xml | 4 ---- .idea/modules/benchmark-micro.iml | 2 -- .idea/modules/elasticsearch-root.iml | 2 -- .idea/modules/elasticsearch.iml | 2 -- .idea/modules/test-integration.iml | 1 - .../lucene/analysis/miscellaneous/TruncateTokenFilter.java | 0 .../lucene/analysis/miscellaneous/UniqueTokenFilter.java | 0 .../lucene/analysis/miscellaneous/WordDelimiterFilter.java | 0 .../lucene/analysis/miscellaneous/WordDelimiterIterator.java | 0 .../apache/lucene/analysis/pattern/PatternReplaceFilter.java | 0 .../org/apache/lucene/analysis/pattern/PatternTokenizer.java | 0 .../java/org/apache/lucene/index/ExtendedIndexSearcher.java | 0 .../apache/lucene/index/TrackingConcurrentMergeScheduler.java | 0 .../org/apache/lucene/index/TrackingSerialMergeScheduler.java | 0 .../org/apache/lucene/index/memory/CustomMemoryIndex.java | 0 .../apache/lucene/queryParser/ExistsFieldQueryExtension.java | 0 .../org/apache/lucene/queryParser/FieldQueryExtension.java | 0 .../java/org/apache/lucene/queryParser/MapperQueryParser.java | 0 .../apache/lucene/queryParser/MissingFieldQueryExtension.java | 0 .../lucene/queryParser/MultiFieldMapperQueryParser.java | 0 .../lucene/queryParser/MultiFieldQueryParserSettings.java | 0 .../org/apache/lucene/queryParser/QueryParserSettings.java | 0 .../apache/lucene/search/DeletionAwareConstantScoreQuery.java | 0 .../main/java/org/apache/lucene/search/PublicTermsFilter.java | 0 .../org/apache/lucene/search/ShardFieldDocSortedHitQueue.java | 0 .../lucene/search/vectorhighlight/CustomFieldQuery.java | 0 .../apache/lucene/store/bytebuffer/ByteBufferAllocator.java | 0 .../apache/lucene/store/bytebuffer/ByteBufferDirectory.java | 0 .../org/apache/lucene/store/bytebuffer/ByteBufferFile.java | 0 .../apache/lucene/store/bytebuffer/ByteBufferIndexInput.java | 0 .../apache/lucene/store/bytebuffer/ByteBufferIndexOutput.java | 0 .../lucene/store/bytebuffer/CachingByteBufferAllocator.java | 0 .../lucene/store/bytebuffer/PlainByteBufferAllocator.java | 0 .../main/java/org/elasticsearch/ElasticSearchException.java | 0 .../org/elasticsearch/ElasticSearchGenerationException.java | 0 .../elasticsearch/ElasticSearchIllegalArgumentException.java | 0 .../org/elasticsearch/ElasticSearchIllegalStateException.java | 0 .../org/elasticsearch/ElasticSearchInterruptedException.java | 0 .../org/elasticsearch/ElasticSearchNullPointerException.java | 0 .../java/org/elasticsearch/ElasticSearchParseException.java | 0 .../java/org/elasticsearch/ElasticSearchTimeoutException.java | 0 .../java/org/elasticsearch/ElasticSearchWrapperException.java | 0 .../main/java/org/elasticsearch/ExceptionsHelper.java | 0 .../src => src}/main/java/org/elasticsearch/Version.java | 0 .../main/java/org/elasticsearch/action/Action.java | 0 .../main/java/org/elasticsearch/action/ActionFuture.java | 0 .../main/java/org/elasticsearch/action/ActionListener.java | 0 .../main/java/org/elasticsearch/action/ActionRequest.java | 0 .../action/ActionRequestValidationException.java | 0 .../main/java/org/elasticsearch/action/ActionResponse.java | 0 .../main/java/org/elasticsearch/action/Actions.java | 0 .../java/org/elasticsearch/action/FailedNodeException.java | 0 .../java/org/elasticsearch/action/ListenableActionFuture.java | 0 .../elasticsearch/action/NoShardAvailableActionException.java | 0 .../java/org/elasticsearch/action/NoSuchNodeException.java | 0 .../elasticsearch/action/PrimaryMissingActionException.java | 0 .../org/elasticsearch/action/RoutingMissingException.java | 0 .../elasticsearch/action/ShardOperationFailedException.java | 0 .../main/java/org/elasticsearch/action/ThreadingModel.java | 0 .../org/elasticsearch/action/TimestampParsingException.java | 0 .../java/org/elasticsearch/action/TransportActionModule.java | 0 .../main/java/org/elasticsearch/action/TransportActions.java | 0 .../org/elasticsearch/action/UnavailableShardsException.java | 0 .../java/org/elasticsearch/action/WriteConsistencyLevel.java | 0 .../action/admin/cluster/health/ClusterHealthRequest.java | 0 .../action/admin/cluster/health/ClusterHealthResponse.java | 0 .../action/admin/cluster/health/ClusterHealthStatus.java | 0 .../action/admin/cluster/health/ClusterIndexHealth.java | 0 .../action/admin/cluster/health/ClusterShardHealth.java | 0 .../admin/cluster/health/TransportClusterHealthAction.java | 0 .../action/admin/cluster/node/info/NodeInfo.java | 0 .../action/admin/cluster/node/info/NodesInfoRequest.java | 0 .../action/admin/cluster/node/info/NodesInfoResponse.java | 0 .../admin/cluster/node/info/TransportNodesInfoAction.java | 0 .../admin/cluster/node/restart/NodesRestartRequest.java | 0 .../admin/cluster/node/restart/NodesRestartResponse.java | 0 .../cluster/node/restart/TransportNodesRestartAction.java | 0 .../admin/cluster/node/shutdown/NodesShutdownRequest.java | 0 .../admin/cluster/node/shutdown/NodesShutdownResponse.java | 0 .../cluster/node/shutdown/TransportNodesShutdownAction.java | 0 .../action/admin/cluster/node/stats/NodeStats.java | 0 .../action/admin/cluster/node/stats/NodesStatsRequest.java | 0 .../action/admin/cluster/node/stats/NodesStatsResponse.java | 0 .../admin/cluster/node/stats/TransportNodesStatsAction.java | 0 .../admin/cluster/ping/broadcast/BroadcastPingRequest.java | 0 .../admin/cluster/ping/broadcast/BroadcastPingResponse.java | 0 .../cluster/ping/broadcast/BroadcastShardPingRequest.java | 0 .../cluster/ping/broadcast/BroadcastShardPingResponse.java | 0 .../cluster/ping/broadcast/TransportBroadcastPingAction.java | 0 .../cluster/ping/replication/IndexReplicationPingRequest.java | 0 .../ping/replication/IndexReplicationPingResponse.java | 0 .../cluster/ping/replication/ReplicationPingRequest.java | 0 .../cluster/ping/replication/ReplicationPingResponse.java | 0 .../cluster/ping/replication/ShardReplicationPingRequest.java | 0 .../ping/replication/ShardReplicationPingResponse.java | 0 .../ping/replication/TransportIndexReplicationPingAction.java | 0 .../ping/replication/TransportReplicationPingAction.java | 0 .../ping/replication/TransportShardReplicationPingAction.java | 0 .../action/admin/cluster/ping/single/SinglePingRequest.java | 0 .../action/admin/cluster/ping/single/SinglePingResponse.java | 0 .../admin/cluster/ping/single/TransportSinglePingAction.java | 0 .../action/admin/cluster/reroute/ClusterRerouteRequest.java | 0 .../action/admin/cluster/reroute/ClusterRerouteResponse.java | 0 .../admin/cluster/reroute/TransportClusterRerouteAction.java | 0 .../admin/cluster/settings/ClusterUpdateSettingsRequest.java | 0 .../admin/cluster/settings/ClusterUpdateSettingsResponse.java | 0 .../settings/TransportClusterUpdateSettingsAction.java | 0 .../action/admin/cluster/state/ClusterStateRequest.java | 0 .../action/admin/cluster/state/ClusterStateResponse.java | 0 .../admin/cluster/state/TransportClusterStateAction.java | 0 .../action/admin/indices/alias/IndicesAliasesRequest.java | 0 .../action/admin/indices/alias/IndicesAliasesResponse.java | 0 .../admin/indices/alias/TransportIndicesAliasesAction.java | 0 .../action/admin/indices/analyze/AnalyzeRequest.java | 0 .../action/admin/indices/analyze/AnalyzeResponse.java | 0 .../action/admin/indices/analyze/TransportAnalyzeAction.java | 0 .../admin/indices/cache/clear/ClearIndicesCacheRequest.java | 0 .../admin/indices/cache/clear/ClearIndicesCacheResponse.java | 0 .../indices/cache/clear/ShardClearIndicesCacheRequest.java | 0 .../indices/cache/clear/ShardClearIndicesCacheResponse.java | 0 .../indices/cache/clear/TransportClearIndicesCacheAction.java | 0 .../action/admin/indices/close/CloseIndexRequest.java | 0 .../action/admin/indices/close/CloseIndexResponse.java | 0 .../action/admin/indices/close/TransportCloseIndexAction.java | 0 .../action/admin/indices/create/CreateIndexRequest.java | 0 .../action/admin/indices/create/CreateIndexResponse.java | 0 .../admin/indices/create/TransportCreateIndexAction.java | 0 .../action/admin/indices/create/package-info.java | 0 .../action/admin/indices/delete/DeleteIndexRequest.java | 0 .../action/admin/indices/delete/DeleteIndexResponse.java | 0 .../admin/indices/delete/TransportDeleteIndexAction.java | 0 .../action/admin/indices/delete/package-info.java | 0 .../action/admin/indices/exists/IndicesExistsRequest.java | 0 .../action/admin/indices/exists/IndicesExistsResponse.java | 0 .../admin/indices/exists/TransportIndicesExistsAction.java | 0 .../action/admin/indices/flush/FlushRequest.java | 0 .../action/admin/indices/flush/FlushResponse.java | 0 .../action/admin/indices/flush/ShardFlushRequest.java | 0 .../action/admin/indices/flush/ShardFlushResponse.java | 0 .../action/admin/indices/flush/TransportFlushAction.java | 0 .../action/admin/indices/flush/package-info.java | 0 .../action/admin/indices/gateway/package-info.java | 0 .../indices/gateway/snapshot/GatewaySnapshotRequest.java | 0 .../indices/gateway/snapshot/GatewaySnapshotResponse.java | 0 .../indices/gateway/snapshot/ShardGatewaySnapshotRequest.java | 0 .../gateway/snapshot/ShardGatewaySnapshotResponse.java | 0 .../gateway/snapshot/TransportGatewaySnapshotAction.java | 0 .../action/admin/indices/gateway/snapshot/package-info.java | 0 .../admin/indices/mapping/delete/DeleteMappingRequest.java | 0 .../admin/indices/mapping/delete/DeleteMappingResponse.java | 0 .../indices/mapping/delete/TransportDeleteMappingAction.java | 0 .../action/admin/indices/mapping/package-info.java | 0 .../action/admin/indices/mapping/put/PutMappingRequest.java | 0 .../action/admin/indices/mapping/put/PutMappingResponse.java | 0 .../admin/indices/mapping/put/TransportPutMappingAction.java | 0 .../action/admin/indices/mapping/put/package-info.java | 0 .../action/admin/indices/open/OpenIndexRequest.java | 0 .../action/admin/indices/open/OpenIndexResponse.java | 0 .../action/admin/indices/open/TransportOpenIndexAction.java | 0 .../action/admin/indices/optimize/OptimizeRequest.java | 0 .../action/admin/indices/optimize/OptimizeResponse.java | 0 .../action/admin/indices/optimize/ShardOptimizeRequest.java | 0 .../action/admin/indices/optimize/ShardOptimizeResponse.java | 0 .../admin/indices/optimize/TransportOptimizeAction.java | 0 .../action/admin/indices/optimize/package-info.java | 0 .../org/elasticsearch/action/admin/indices/package-info.java | 0 .../action/admin/indices/refresh/RefreshRequest.java | 0 .../action/admin/indices/refresh/RefreshResponse.java | 0 .../action/admin/indices/refresh/ShardRefreshRequest.java | 0 .../action/admin/indices/refresh/ShardRefreshResponse.java | 0 .../action/admin/indices/refresh/TransportRefreshAction.java | 0 .../action/admin/indices/refresh/package-info.java | 0 .../action/admin/indices/segments/IndexSegments.java | 0 .../action/admin/indices/segments/IndexShardSegments.java | 0 .../action/admin/indices/segments/IndicesSegmentResponse.java | 0 .../action/admin/indices/segments/IndicesSegmentsRequest.java | 0 .../action/admin/indices/segments/ShardSegments.java | 0 .../indices/segments/TransportIndicesSegmentsAction.java | 0 .../admin/indices/settings/TransportUpdateSettingsAction.java | 0 .../action/admin/indices/settings/UpdateSettingsRequest.java | 0 .../action/admin/indices/settings/UpdateSettingsResponse.java | 0 .../elasticsearch/action/admin/indices/stats/CommonStats.java | 0 .../action/admin/indices/stats/IndexShardStats.java | 0 .../elasticsearch/action/admin/indices/stats/IndexStats.java | 0 .../action/admin/indices/stats/IndicesStats.java | 0 .../action/admin/indices/stats/IndicesStatsRequest.java | 0 .../elasticsearch/action/admin/indices/stats/ShardStats.java | 0 .../admin/indices/stats/TransportIndicesStatsAction.java | 0 .../elasticsearch/action/admin/indices/status/DocsStatus.java | 0 .../action/admin/indices/status/GatewayRecoveryStatus.java | 0 .../action/admin/indices/status/GatewaySnapshotStatus.java | 0 .../action/admin/indices/status/IndexShardStatus.java | 0 .../action/admin/indices/status/IndexStatus.java | 0 .../action/admin/indices/status/IndicesStatusRequest.java | 0 .../action/admin/indices/status/IndicesStatusResponse.java | 0 .../action/admin/indices/status/PeerRecoveryStatus.java | 0 .../action/admin/indices/status/ShardStatus.java | 0 .../admin/indices/status/TransportIndicesStatusAction.java | 0 .../indices/template/delete/DeleteIndexTemplateRequest.java | 0 .../indices/template/delete/DeleteIndexTemplateResponse.java | 0 .../template/delete/TransportDeleteIndexTemplateAction.java | 0 .../admin/indices/template/put/PutIndexTemplateRequest.java | 0 .../admin/indices/template/put/PutIndexTemplateResponse.java | 0 .../indices/template/put/TransportPutIndexTemplateAction.java | 0 .../java/org/elasticsearch/action/admin/package-info.java | 0 .../java/org/elasticsearch/action/bulk/BulkItemRequest.java | 0 .../java/org/elasticsearch/action/bulk/BulkItemResponse.java | 0 .../main/java/org/elasticsearch/action/bulk/BulkRequest.java | 0 .../main/java/org/elasticsearch/action/bulk/BulkResponse.java | 0 .../java/org/elasticsearch/action/bulk/BulkShardRequest.java | 0 .../java/org/elasticsearch/action/bulk/BulkShardResponse.java | 0 .../org/elasticsearch/action/bulk/TransportBulkAction.java | 0 .../elasticsearch/action/bulk/TransportShardBulkAction.java | 0 .../java/org/elasticsearch/action/count/CountRequest.java | 0 .../java/org/elasticsearch/action/count/CountResponse.java | 0 .../org/elasticsearch/action/count/ShardCountRequest.java | 0 .../org/elasticsearch/action/count/ShardCountResponse.java | 0 .../org/elasticsearch/action/count/TransportCountAction.java | 0 .../java/org/elasticsearch/action/count/pacakge-info.java | 0 .../java/org/elasticsearch/action/delete/DeleteRequest.java | 0 .../java/org/elasticsearch/action/delete/DeleteResponse.java | 0 .../elasticsearch/action/delete/TransportDeleteAction.java | 0 .../elasticsearch/action/delete/index/IndexDeleteRequest.java | 0 .../action/delete/index/IndexDeleteResponse.java | 0 .../elasticsearch/action/delete/index/ShardDeleteRequest.java | 0 .../action/delete/index/ShardDeleteResponse.java | 0 .../action/delete/index/TransportIndexDeleteAction.java | 0 .../action/delete/index/TransportShardDeleteAction.java | 0 .../java/org/elasticsearch/action/delete/package-info.java | 0 .../action/deletebyquery/DeleteByQueryRequest.java | 0 .../action/deletebyquery/DeleteByQueryResponse.java | 0 .../action/deletebyquery/IndexDeleteByQueryRequest.java | 0 .../action/deletebyquery/IndexDeleteByQueryResponse.java | 0 .../action/deletebyquery/ShardDeleteByQueryRequest.java | 0 .../action/deletebyquery/ShardDeleteByQueryResponse.java | 0 .../action/deletebyquery/TransportDeleteByQueryAction.java | 0 .../deletebyquery/TransportIndexDeleteByQueryAction.java | 0 .../deletebyquery/TransportShardDeleteByQueryAction.java | 0 .../org/elasticsearch/action/deletebyquery/package-info.java | 0 .../main/java/org/elasticsearch/action/get/GetRequest.java | 0 .../main/java/org/elasticsearch/action/get/GetResponse.java | 0 .../org/elasticsearch/action/get/MultiGetItemResponse.java | 0 .../java/org/elasticsearch/action/get/MultiGetRequest.java | 0 .../java/org/elasticsearch/action/get/MultiGetResponse.java | 0 .../org/elasticsearch/action/get/MultiGetShardRequest.java | 0 .../org/elasticsearch/action/get/MultiGetShardResponse.java | 0 .../java/org/elasticsearch/action/get/TransportGetAction.java | 0 .../org/elasticsearch/action/get/TransportMultiGetAction.java | 0 .../action/get/TransportShardMultiGetAction.java | 0 .../main/java/org/elasticsearch/action/get/package-info.java | 0 .../java/org/elasticsearch/action/index/IndexRequest.java | 0 .../java/org/elasticsearch/action/index/IndexResponse.java | 0 .../org/elasticsearch/action/index/TransportIndexAction.java | 0 .../java/org/elasticsearch/action/index/package-info.java | 0 .../org/elasticsearch/action/mlt/MoreLikeThisRequest.java | 0 .../elasticsearch/action/mlt/TransportMoreLikeThisAction.java | 0 .../main/java/org/elasticsearch/action/mlt/package-info.java | 0 .../org/elasticsearch/action/percolate/PercolateRequest.java | 0 .../org/elasticsearch/action/percolate/PercolateResponse.java | 0 .../action/percolate/TransportPercolateAction.java | 0 .../action/search/ReduceSearchPhaseException.java | 0 .../elasticsearch/action/search/SearchOperationThreading.java | 0 .../action/search/SearchPhaseExecutionException.java | 0 .../java/org/elasticsearch/action/search/SearchRequest.java | 0 .../java/org/elasticsearch/action/search/SearchResponse.java | 0 .../org/elasticsearch/action/search/SearchScrollRequest.java | 0 .../main/java/org/elasticsearch/action/search/SearchType.java | 0 .../org/elasticsearch/action/search/ShardSearchFailure.java | 0 .../elasticsearch/action/search/TransportSearchAction.java | 0 .../action/search/TransportSearchScrollAction.java | 0 .../java/org/elasticsearch/action/search/package-info.java | 0 .../org/elasticsearch/action/search/type/ParsedScrollId.java | 0 .../action/search/type/TransportSearchCache.java | 0 .../action/search/type/TransportSearchCountAction.java | 0 .../search/type/TransportSearchDfsQueryAndFetchAction.java | 0 .../search/type/TransportSearchDfsQueryThenFetchAction.java | 0 .../action/search/type/TransportSearchHelper.java | 0 .../search/type/TransportSearchQueryAndFetchAction.java | 0 .../search/type/TransportSearchQueryThenFetchAction.java | 0 .../action/search/type/TransportSearchScanAction.java | 0 .../search/type/TransportSearchScrollQueryAndFetchAction.java | 0 .../type/TransportSearchScrollQueryThenFetchAction.java | 0 .../action/search/type/TransportSearchScrollScanAction.java | 0 .../action/search/type/TransportSearchTypeAction.java | 0 .../action/support/AbstractListenableActionFuture.java | 0 .../org/elasticsearch/action/support/AdapterActionFuture.java | 0 .../java/org/elasticsearch/action/support/BaseAction.java | 0 .../action/support/DefaultShardOperationFailedException.java | 0 .../org/elasticsearch/action/support/PlainActionFuture.java | 0 .../action/support/PlainListenableActionFuture.java | 0 .../action/support/broadcast/BroadcastOperationRequest.java | 0 .../action/support/broadcast/BroadcastOperationResponse.java | 0 .../action/support/broadcast/BroadcastOperationThreading.java | 0 .../broadcast/BroadcastShardOperationFailedException.java | 0 .../support/broadcast/BroadcastShardOperationRequest.java | 0 .../support/broadcast/BroadcastShardOperationResponse.java | 0 .../support/broadcast/TransportBroadcastOperationAction.java | 0 .../action/support/master/MasterNodeOperationRequest.java | 0 .../support/master/TransportMasterNodeOperationAction.java | 0 .../action/support/nodes/NodeOperationRequest.java | 0 .../action/support/nodes/NodeOperationResponse.java | 0 .../action/support/nodes/NodesOperationRequest.java | 0 .../action/support/nodes/NodesOperationResponse.java | 0 .../action/support/nodes/TransportNodesOperationAction.java | 0 .../support/replication/IndexReplicationOperationRequest.java | 0 .../replication/IndicesReplicationOperationRequest.java | 0 .../replication/ReplicationShardOperationFailedException.java | 0 .../action/support/replication/ReplicationType.java | 0 .../support/replication/ShardReplicationOperationRequest.java | 0 .../replication/TransportIndexReplicationOperationAction.java | 0 .../TransportIndicesReplicationOperationAction.java | 0 .../replication/TransportShardReplicationOperationAction.java | 0 .../support/single/custom/SingleCustomOperationRequest.java | 0 .../single/custom/TransportSingleCustomOperationAction.java | 0 .../support/single/shard/SingleShardOperationRequest.java | 0 .../single/shard/TransportShardSingleOperationAction.java | 0 .../main/java/org/elasticsearch/bootstrap/Bootstrap.java | 0 .../main/java/org/elasticsearch/bootstrap/ElasticSearch.java | 0 .../main/java/org/elasticsearch/cache/NodeCache.java | 0 .../main/java/org/elasticsearch/cache/NodeCacheModule.java | 0 .../java/org/elasticsearch/cache/memory/ByteBufferCache.java | 0 .../main/java/org/elasticsearch/client/AdminClient.java | 0 .../main/java/org/elasticsearch/client/Client.java | 0 .../java/org/elasticsearch/client/ClusterAdminClient.java | 0 .../java/org/elasticsearch/client/IndicesAdminClient.java | 0 .../main/java/org/elasticsearch/client/Requests.java | 0 .../java/org/elasticsearch/client/action/RequestBuilder.java | 0 .../admin/cluster/health/ClusterHealthRequestBuilder.java | 0 .../admin/cluster/node/info/NodesInfoRequestBuilder.java | 0 .../cluster/node/restart/NodesRestartRequestBuilder.java | 0 .../cluster/node/shutdown/NodesShutdownRequestBuilder.java | 0 .../admin/cluster/node/stats/NodesStatsRequestBuilder.java | 0 .../cluster/ping/broadcast/BroadcastPingRequestBuilder.java | 0 .../ping/replication/ReplicationPingRequestBuilder.java | 0 .../admin/cluster/ping/single/SinglePingRequestBuilder.java | 0 .../admin/cluster/reroute/ClusterRerouteRequestBuilder.java | 0 .../cluster/settings/ClusterUpdateSettingsRequestBuilder.java | 0 .../admin/cluster/state/ClusterStateRequestBuilder.java | 0 .../admin/cluster/support/BaseClusterRequestBuilder.java | 0 .../admin/indices/alias/IndicesAliasesRequestBuilder.java | 0 .../action/admin/indices/analyze/AnalyzeRequestBuilder.java | 0 .../indices/cache/clear/ClearIndicesCacheRequestBuilder.java | 0 .../action/admin/indices/close/CloseIndexRequestBuilder.java | 0 .../admin/indices/create/CreateIndexRequestBuilder.java | 0 .../admin/indices/delete/DeleteIndexRequestBuilder.java | 0 .../admin/indices/exists/IndicesExistsRequestBuilder.java | 0 .../action/admin/indices/flush/FlushRequestBuilder.java | 0 .../gateway/snapshot/GatewaySnapshotRequestBuilder.java | 0 .../indices/mapping/delete/DeleteMappingRequestBuilder.java | 0 .../admin/indices/mapping/put/PutMappingRequestBuilder.java | 0 .../action/admin/indices/open/OpenIndexRequestBuilder.java | 0 .../action/admin/indices/optimize/OptimizeRequestBuilder.java | 0 .../action/admin/indices/refresh/RefreshRequestBuilder.java | 0 .../admin/indices/segments/IndicesSegmentsRequestBuilder.java | 0 .../admin/indices/settings/UpdateSettingsRequestBuilder.java | 0 .../admin/indices/stats/IndicesStatsRequestBuilder.java | 0 .../admin/indices/status/IndicesStatusRequestBuilder.java | 0 .../admin/indices/support/BaseIndicesRequestBuilder.java | 0 .../template/delete/DeleteIndexTemplateRequestBuilder.java | 0 .../indices/template/put/PutIndexTemplateRequestBuilder.java | 0 .../elasticsearch/client/action/bulk/BulkRequestBuilder.java | 0 .../client/action/count/CountRequestBuilder.java | 0 .../client/action/delete/DeleteRequestBuilder.java | 0 .../action/deletebyquery/DeleteByQueryRequestBuilder.java | 0 .../elasticsearch/client/action/get/GetRequestBuilder.java | 0 .../client/action/get/MultiGetRequestBuilder.java | 0 .../client/action/index/IndexRequestBuilder.java | 0 .../client/action/mlt/MoreLikeThisRequestBuilder.java | 0 .../client/action/percolate/PercolateRequestBuilder.java | 0 .../client/action/search/SearchRequestBuilder.java | 0 .../client/action/search/SearchScrollRequestBuilder.java | 0 .../client/action/support/BaseRequestBuilder.java | 0 .../org/elasticsearch/client/internal/InternalClient.java | 0 .../client/internal/InternalClusterAdminClient.java | 0 .../client/internal/InternalIndicesAdminClient.java | 0 .../java/org/elasticsearch/client/node/NodeAdminClient.java | 0 .../main/java/org/elasticsearch/client/node/NodeClient.java | 0 .../java/org/elasticsearch/client/node/NodeClientModule.java | 0 .../org/elasticsearch/client/node/NodeClusterAdminClient.java | 0 .../org/elasticsearch/client/node/NodeIndicesAdminClient.java | 0 .../main/java/org/elasticsearch/client/package-info.java | 0 .../java/org/elasticsearch/client/support/AbstractClient.java | 0 .../client/support/AbstractClusterAdminClient.java | 0 .../client/support/AbstractIndicesAdminClient.java | 0 .../elasticsearch/client/transport/ClientTransportModule.java | 0 .../client/transport/NoNodeAvailableException.java | 0 .../org/elasticsearch/client/transport/TransportClient.java | 0 .../client/transport/TransportClientNodesService.java | 0 .../client/transport/action/ClientTransportAction.java | 0 .../client/transport/action/ClientTransportActionModule.java | 0 .../cluster/health/ClientTransportClusterHealthAction.java | 0 .../cluster/node/info/ClientTransportNodesInfoAction.java | 0 .../node/restart/ClientTransportNodesRestartAction.java | 0 .../node/shutdown/ClientTransportNodesShutdownAction.java | 0 .../cluster/node/stats/ClientTransportNodesStatsAction.java | 0 .../ping/broadcast/ClientTransportBroadcastPingAction.java | 0 .../replication/ClientTransportReplicationPingAction.java | 0 .../cluster/ping/single/ClientTransportSinglePingAction.java | 0 .../cluster/reroute/ClientTransportClusterRerouteAction.java | 0 .../settings/ClientTransportClusterUpdateSettingsAction.java | 0 .../cluster/state/ClientTransportClusterStateAction.java | 0 .../indices/alias/ClientTransportIndicesAliasesAction.java | 0 .../admin/indices/analyze/ClientTransportAnalyzeAction.java | 0 .../cache/clear/ClientTransportClearIndicesCacheAction.java | 0 .../admin/indices/close/ClientTransportCloseIndexAction.java | 0 .../indices/create/ClientTransportCreateIndexAction.java | 0 .../indices/delete/ClientTransportDeleteIndexAction.java | 0 .../indices/exists/ClientTransportIndicesExistsAction.java | 0 .../admin/indices/flush/ClientTransportFlushAction.java | 0 .../snapshot/ClientTransportGatewaySnapshotAction.java | 0 .../mapping/delete/ClientTransportDeleteMappingAction.java | 0 .../indices/mapping/put/ClientTransportPutMappingAction.java | 0 .../admin/indices/open/ClientTransportOpenIndexAction.java | 0 .../admin/indices/optimize/ClientTransportOptimizeAction.java | 0 .../admin/indices/refresh/ClientTransportRefreshAction.java | 0 .../segments/ClientTransportIndicesSegmentsAction.java | 0 .../indices/settings/ClientTransportUpdateSettingsAction.java | 0 .../indices/stats/ClientTransportIndicesStatsAction.java | 0 .../indices/status/ClientTransportIndicesStatusAction.java | 0 .../delete/ClientTransportDeleteIndexTemplateAction.java | 0 .../template/put/ClientTransportPutIndexTemplateAction.java | 0 .../transport/action/bulk/ClientTransportBulkAction.java | 0 .../transport/action/count/ClientTransportCountAction.java | 0 .../transport/action/delete/ClientTransportDeleteAction.java | 0 .../deletebyquery/ClientTransportDeleteByQueryAction.java | 0 .../client/transport/action/get/ClientTransportGetAction.java | 0 .../transport/action/get/ClientTransportMultiGetAction.java | 0 .../transport/action/index/ClientTransportIndexAction.java | 0 .../action/mlt/ClientTransportMoreLikeThisAction.java | 0 .../action/percolate/ClientTransportPercolateAction.java | 0 .../transport/action/search/ClientTransportSearchAction.java | 0 .../action/search/ClientTransportSearchScrollAction.java | 0 .../transport/action/support/BaseClientTransportAction.java | 0 .../transport/support/InternalTransportAdminClient.java | 0 .../client/transport/support/InternalTransportClient.java | 0 .../support/InternalTransportClusterAdminClient.java | 0 .../support/InternalTransportIndicesAdminClient.java | 0 .../java/org/elasticsearch/cluster/ClusterChangedEvent.java | 0 .../main/java/org/elasticsearch/cluster/ClusterModule.java | 0 .../main/java/org/elasticsearch/cluster/ClusterName.java | 0 .../java/org/elasticsearch/cluster/ClusterNameModule.java | 0 .../main/java/org/elasticsearch/cluster/ClusterService.java | 0 .../main/java/org/elasticsearch/cluster/ClusterState.java | 0 .../java/org/elasticsearch/cluster/ClusterStateListener.java | 0 .../org/elasticsearch/cluster/ClusterStateUpdateTask.java | 0 .../cluster/ProcessedClusterStateUpdateTask.java | 0 .../elasticsearch/cluster/TimeoutClusterStateListener.java | 0 .../cluster/action/index/MappingUpdatedAction.java | 0 .../cluster/action/index/NodeAliasesUpdatedAction.java | 0 .../cluster/action/index/NodeIndexCreatedAction.java | 0 .../cluster/action/index/NodeIndexDeletedAction.java | 0 .../cluster/action/index/NodeMappingCreatedAction.java | 0 .../cluster/action/index/NodeMappingRefreshAction.java | 0 .../elasticsearch/cluster/action/shard/ShardStateAction.java | 0 .../java/org/elasticsearch/cluster/block/ClusterBlock.java | 0 .../elasticsearch/cluster/block/ClusterBlockException.java | 0 .../org/elasticsearch/cluster/block/ClusterBlockLevel.java | 0 .../java/org/elasticsearch/cluster/block/ClusterBlocks.java | 0 .../java/org/elasticsearch/cluster/metadata/AliasAction.java | 0 .../org/elasticsearch/cluster/metadata/AliasMetaData.java | 0 .../org/elasticsearch/cluster/metadata/IndexMetaData.java | 0 .../elasticsearch/cluster/metadata/IndexTemplateMetaData.java | 0 .../org/elasticsearch/cluster/metadata/MappingMetaData.java | 0 .../java/org/elasticsearch/cluster/metadata/MetaData.java | 0 .../cluster/metadata/MetaDataCreateIndexService.java | 0 .../cluster/metadata/MetaDataDeleteIndexService.java | 0 .../cluster/metadata/MetaDataIndexAliasesService.java | 0 .../cluster/metadata/MetaDataIndexTemplateService.java | 0 .../cluster/metadata/MetaDataMappingService.java | 0 .../org/elasticsearch/cluster/metadata/MetaDataService.java | 0 .../cluster/metadata/MetaDataStateIndexService.java | 0 .../cluster/metadata/MetaDataUpdateSettingsService.java | 0 .../java/org/elasticsearch/cluster/node/DiscoveryNode.java | 0 .../org/elasticsearch/cluster/node/DiscoveryNodeFilters.java | 0 .../org/elasticsearch/cluster/node/DiscoveryNodeService.java | 0 .../java/org/elasticsearch/cluster/node/DiscoveryNodes.java | 0 .../elasticsearch/cluster/routing/GroupShardsIterator.java | 0 .../cluster/routing/IllegalShardRoutingStateException.java | 0 .../elasticsearch/cluster/routing/ImmutableShardRouting.java | 0 .../org/elasticsearch/cluster/routing/IndexRoutingTable.java | 0 .../elasticsearch/cluster/routing/IndexShardRoutingTable.java | 0 .../elasticsearch/cluster/routing/MutableShardRouting.java | 0 .../org/elasticsearch/cluster/routing/PlainShardIterator.java | 0 .../elasticsearch/cluster/routing/PlainShardsIterator.java | 0 .../org/elasticsearch/cluster/routing/RoutingBuilders.java | 0 .../org/elasticsearch/cluster/routing/RoutingException.java | 0 .../java/org/elasticsearch/cluster/routing/RoutingNode.java | 0 .../java/org/elasticsearch/cluster/routing/RoutingNodes.java | 0 .../org/elasticsearch/cluster/routing/RoutingService.java | 0 .../java/org/elasticsearch/cluster/routing/RoutingTable.java | 0 .../elasticsearch/cluster/routing/RoutingTableValidation.java | 0 .../cluster/routing/RoutingValidationException.java | 0 .../java/org/elasticsearch/cluster/routing/ShardIterator.java | 0 .../java/org/elasticsearch/cluster/routing/ShardRouting.java | 0 .../org/elasticsearch/cluster/routing/ShardRoutingState.java | 0 .../org/elasticsearch/cluster/routing/ShardsIterator.java | 0 .../cluster/routing/allocation/AllocationExplanation.java | 0 .../cluster/routing/allocation/AllocationModule.java | 0 .../cluster/routing/allocation/AllocationService.java | 0 .../cluster/routing/allocation/FailedRerouteAllocation.java | 0 .../cluster/routing/allocation/RoutingAllocation.java | 0 .../cluster/routing/allocation/StartedRerouteAllocation.java | 0 .../allocation/allocator/EvenShardsCountAllocator.java | 0 .../routing/allocation/allocator/GatewayAllocator.java | 0 .../cluster/routing/allocation/allocator/ShardsAllocator.java | 0 .../routing/allocation/allocator/ShardsAllocatorModule.java | 0 .../routing/allocation/allocator/ShardsAllocators.java | 0 .../cluster/routing/allocation/decider/AllocationDecider.java | 0 .../routing/allocation/decider/AllocationDeciders.java | 0 .../routing/allocation/decider/AllocationDecidersModule.java | 0 .../allocation/decider/AwarenessAllocationDecider.java | 0 .../allocation/decider/ClusterRebalanceAllocationDecider.java | 0 .../decider/ConcurrentRebalanceAllocationDecider.java | 0 .../routing/allocation/decider/DisableAllocationDecider.java | 0 .../routing/allocation/decider/FilterAllocationDecider.java | 0 .../decider/RebalanceOnlyWhenActiveAllocationDecider.java | 0 .../decider/ReplicaAfterPrimaryActiveAllocationDecider.java | 0 .../allocation/decider/SameShardAllocationDecider.java | 0 .../allocation/decider/ThrottlingAllocationDecider.java | 0 .../cluster/routing/operation/OperationRouting.java | 0 .../cluster/routing/operation/OperationRoutingModule.java | 0 .../cluster/routing/operation/hash/HashFunction.java | 0 .../cluster/routing/operation/hash/djb/DjbHashFunction.java | 0 .../routing/operation/hash/simple/SimpleHashFunction.java | 0 .../routing/operation/plain/PlainOperationRouting.java | 0 .../routing/operation/plain/PlainOperationRoutingModule.java | 0 .../elasticsearch/cluster/service/InternalClusterService.java | 0 .../main/java/org/elasticsearch/common/Base64.java | 0 .../main/java/org/elasticsearch/common/Booleans.java | 0 .../src => src}/main/java/org/elasticsearch/common/Bytes.java | 0 .../main/java/org/elasticsearch/common/BytesHolder.java | 0 .../main/java/org/elasticsearch/common/BytesWrap.java | 0 .../main/java/org/elasticsearch/common/CacheRecycler.java | 0 .../main/java/org/elasticsearch/common/Classes.java | 0 .../main/java/org/elasticsearch/common/Digest.java | 0 .../src => src}/main/java/org/elasticsearch/common/Hex.java | 0 .../src => src}/main/java/org/elasticsearch/common/Names.java | 0 .../main/java/org/elasticsearch/common/Nullable.java | 0 .../main/java/org/elasticsearch/common/Numbers.java | 0 .../main/java/org/elasticsearch/common/Preconditions.java | 0 .../main/java/org/elasticsearch/common/RamUsage.java | 0 .../java/org/elasticsearch/common/RandomStringGenerator.java | 0 .../main/java/org/elasticsearch/common/RateLimiter.java | 0 .../main/java/org/elasticsearch/common/Required.java | 0 .../main/java/org/elasticsearch/common/StopWatch.java | 0 .../main/java/org/elasticsearch/common/Strings.java | 2 +- .../src => src}/main/java/org/elasticsearch/common/UUID.java | 0 .../main/java/org/elasticsearch/common/Unicode.java | 0 .../org/elasticsearch/common/blobstore/BlobContainer.java | 0 .../java/org/elasticsearch/common/blobstore/BlobMetaData.java | 0 .../java/org/elasticsearch/common/blobstore/BlobPath.java | 0 .../java/org/elasticsearch/common/blobstore/BlobStore.java | 0 .../elasticsearch/common/blobstore/BlobStoreException.java | 0 .../common/blobstore/ImmutableBlobContainer.java | 0 .../common/blobstore/fs/AbstractFsBlobContainer.java | 0 .../org/elasticsearch/common/blobstore/fs/FsBlobStore.java | 0 .../common/blobstore/fs/FsImmutableBlobContainer.java | 0 .../common/blobstore/support/AbstractBlobContainer.java | 0 .../elasticsearch/common/blobstore/support/BlobStores.java | 0 .../common/blobstore/support/PlainBlobMetaData.java | 0 .../org/elasticsearch/common/bloom/BloomCalculations.java | 0 .../main/java/org/elasticsearch/common/bloom/BloomFilter.java | 0 .../org/elasticsearch/common/bloom/BloomFilterFactory.java | 0 .../main/java/org/elasticsearch/common/bloom/MurmurHash.java | 0 .../java/org/elasticsearch/common/bloom/ObsBloomFilter.java | 0 .../org/elasticsearch/common/collect/BoundedArrayList.java | 0 .../java/org/elasticsearch/common/collect/BoundedTreeSet.java | 0 .../org/elasticsearch/common/collect/IdentityHashSet.java | 0 .../java/org/elasticsearch/common/collect/MapBackedSet.java | 0 .../java/org/elasticsearch/common/collect/MapBuilder.java | 0 .../org/elasticsearch/common/collect/ReusableIterator.java | 0 .../main/java/org/elasticsearch/common/collect/SafeArray.java | 0 .../main/java/org/elasticsearch/common/collect/Tuple.java | 0 .../org/elasticsearch/common/component/AbstractComponent.java | 0 .../common/component/AbstractLifecycleComponent.java | 0 .../elasticsearch/common/component/CloseableComponent.java | 0 .../java/org/elasticsearch/common/component/Lifecycle.java | 0 .../elasticsearch/common/component/LifecycleComponent.java | 0 .../org/elasticsearch/common/component/LifecycleListener.java | 0 .../org/elasticsearch/common/compress/CompressedString.java | 0 .../elasticsearch/common/compress/bzip2/BZip2Constants.java | 0 .../common/compress/bzip2/CBZip2InputStream.java | 0 .../common/compress/bzip2/CBZip2OutputStream.java | 0 .../java/org/elasticsearch/common/compress/bzip2/CRC.java | 0 .../org/elasticsearch/common/compress/lzf/BufferRecycler.java | 0 .../org/elasticsearch/common/compress/lzf/ChunkDecoder.java | 0 .../org/elasticsearch/common/compress/lzf/ChunkEncoder.java | 0 .../main/java/org/elasticsearch/common/compress/lzf/LZF.java | 0 .../java/org/elasticsearch/common/compress/lzf/LZFChunk.java | 0 .../org/elasticsearch/common/compress/lzf/LZFDecoder.java | 0 .../org/elasticsearch/common/compress/lzf/LZFEncoder.java | 0 .../common/compress/lzf/impl/UnsafeChunkDecoder.java | 0 .../common/compress/lzf/impl/VanillaChunkDecoder.java | 0 .../org/elasticsearch/common/compress/lzf/package-info.java | 0 .../common/compress/lzf/util/ChunkDecoderFactory.java | 0 .../elasticsearch/common/http/client/HttpDownloadHelper.java | 0 .../java/org/elasticsearch/common/inject/AbstractModule.java | 0 .../org/elasticsearch/common/inject/AbstractProcessor.java | 0 .../main/java/org/elasticsearch/common/inject/Binder.java | 0 .../main/java/org/elasticsearch/common/inject/Binding.java | 0 .../org/elasticsearch/common/inject/BindingAnnotation.java | 0 .../org/elasticsearch/common/inject/BindingProcessor.java | 0 .../org/elasticsearch/common/inject/BoundProviderFactory.java | 0 .../elasticsearch/common/inject/ConfigurationException.java | 0 .../java/org/elasticsearch/common/inject/ConstantFactory.java | 0 .../org/elasticsearch/common/inject/ConstructionProxy.java | 0 .../elasticsearch/common/inject/ConstructionProxyFactory.java | 0 .../elasticsearch/common/inject/ConstructorBindingImpl.java | 0 .../org/elasticsearch/common/inject/ConstructorInjector.java | 0 .../elasticsearch/common/inject/ConstructorInjectorStore.java | 0 .../org/elasticsearch/common/inject/ContextualCallable.java | 0 .../org/elasticsearch/common/inject/CreationException.java | 0 .../common/inject/DefaultConstructionProxyFactory.java | 0 .../java/org/elasticsearch/common/inject/DeferredLookups.java | 0 .../java/org/elasticsearch/common/inject/EncounterImpl.java | 0 .../main/java/org/elasticsearch/common/inject/Exposed.java | 0 .../org/elasticsearch/common/inject/ExposedKeyFactory.java | 0 .../java/org/elasticsearch/common/inject/FactoryProxy.java | 0 .../main/java/org/elasticsearch/common/inject/Guice.java | 0 .../java/org/elasticsearch/common/inject/ImplementedBy.java | 0 .../java/org/elasticsearch/common/inject/InheritingState.java | 0 .../java/org/elasticsearch/common/inject/Initializable.java | 0 .../java/org/elasticsearch/common/inject/Initializables.java | 0 .../java/org/elasticsearch/common/inject/Initializer.java | 0 .../main/java/org/elasticsearch/common/inject/Inject.java | 0 .../common/inject/InjectionRequestProcessor.java | 0 .../main/java/org/elasticsearch/common/inject/Injector.java | 0 .../java/org/elasticsearch/common/inject/InjectorBuilder.java | 0 .../java/org/elasticsearch/common/inject/InjectorImpl.java | 0 .../java/org/elasticsearch/common/inject/InjectorShell.java | 0 .../main/java/org/elasticsearch/common/inject/Injectors.java | 0 .../common/inject/InternalFactoryToProviderAdapter.java | 0 .../main/java/org/elasticsearch/common/inject/Key.java | 0 .../java/org/elasticsearch/common/inject/LookupProcessor.java | 0 .../main/java/org/elasticsearch/common/inject/Lookups.java | 0 .../java/org/elasticsearch/common/inject/MembersInjector.java | 0 .../org/elasticsearch/common/inject/MembersInjectorImpl.java | 0 .../org/elasticsearch/common/inject/MembersInjectorStore.java | 0 .../org/elasticsearch/common/inject/MessageProcessor.java | 0 .../main/java/org/elasticsearch/common/inject/Module.java | 0 .../main/java/org/elasticsearch/common/inject/Modules.java | 0 .../java/org/elasticsearch/common/inject/ModulesBuilder.java | 0 .../org/elasticsearch/common/inject/OutOfScopeException.java | 0 .../org/elasticsearch/common/inject/PreProcessModule.java | 0 .../java/org/elasticsearch/common/inject/PrivateBinder.java | 0 .../elasticsearch/common/inject/PrivateElementProcessor.java | 0 .../java/org/elasticsearch/common/inject/PrivateModule.java | 0 .../main/java/org/elasticsearch/common/inject/ProvidedBy.java | 0 .../main/java/org/elasticsearch/common/inject/Provider.java | 0 .../common/inject/ProviderToInternalFactoryAdapter.java | 0 .../main/java/org/elasticsearch/common/inject/Provides.java | 0 .../org/elasticsearch/common/inject/ProvisionException.java | 0 .../main/java/org/elasticsearch/common/inject/Reflection.java | 0 .../main/java/org/elasticsearch/common/inject/Scope.java | 0 .../java/org/elasticsearch/common/inject/ScopeAnnotation.java | 0 .../elasticsearch/common/inject/ScopeBindingProcessor.java | 0 .../main/java/org/elasticsearch/common/inject/Scopes.java | 0 .../org/elasticsearch/common/inject/SingleFieldInjector.java | 0 .../org/elasticsearch/common/inject/SingleMemberInjector.java | 0 .../org/elasticsearch/common/inject/SingleMethodInjector.java | 0 .../elasticsearch/common/inject/SingleParameterInjector.java | 0 .../main/java/org/elasticsearch/common/inject/Singleton.java | 0 .../java/org/elasticsearch/common/inject/SpawnModules.java | 0 .../main/java/org/elasticsearch/common/inject/Stage.java | 0 .../main/java/org/elasticsearch/common/inject/State.java | 0 .../common/inject/TypeConverterBindingProcessor.java | 0 .../common/inject/TypeListenerBindingProcessor.java | 0 .../java/org/elasticsearch/common/inject/TypeLiteral.java | 0 .../main/java/org/elasticsearch/common/inject/WeakKeySet.java | 0 .../elasticsearch/common/inject/assistedinject/Assisted.java | 0 .../common/inject/assistedinject/AssistedConstructor.java | 0 .../common/inject/assistedinject/AssistedInject.java | 0 .../common/inject/assistedinject/FactoryProvider.java | 0 .../common/inject/assistedinject/FactoryProvider2.java | 0 .../elasticsearch/common/inject/assistedinject/Parameter.java | 0 .../common/inject/assistedinject/ParameterListKey.java | 0 .../common/inject/assistedinject/package-info.java | 0 .../common/inject/binder/AnnotatedBindingBuilder.java | 0 .../common/inject/binder/AnnotatedConstantBindingBuilder.java | 0 .../common/inject/binder/AnnotatedElementBuilder.java | 0 .../common/inject/binder/ConstantBindingBuilder.java | 0 .../common/inject/binder/LinkedBindingBuilder.java | 0 .../common/inject/binder/ScopedBindingBuilder.java | 0 .../org/elasticsearch/common/inject/binder/package-info.java | 0 .../common/inject/internal/AbstractBindingBuilder.java | 0 .../org/elasticsearch/common/inject/internal/Annotations.java | 0 .../inject/internal/AsynchronousComputationException.java | 0 .../elasticsearch/common/inject/internal/BindingBuilder.java | 0 .../org/elasticsearch/common/inject/internal/BindingImpl.java | 0 .../org/elasticsearch/common/inject/internal/BytecodeGen.java | 0 .../org/elasticsearch/common/inject/internal/Classes.java | 0 .../common/inject/internal/ComputationException.java | 0 .../common/inject/internal/ConstantBindingBuilderImpl.java | 0 .../common/inject/internal/ConstructionContext.java | 0 .../elasticsearch/common/inject/internal/ErrorHandler.java | 0 .../java/org/elasticsearch/common/inject/internal/Errors.java | 0 .../elasticsearch/common/inject/internal/ErrorsException.java | 0 .../elasticsearch/common/inject/internal/ExpirationTimer.java | 0 .../common/inject/internal/ExposedBindingImpl.java | 0 .../elasticsearch/common/inject/internal/ExposureBuilder.java | 0 .../elasticsearch/common/inject/internal/FailableCache.java | 0 .../common/inject/internal/InstanceBindingImpl.java | 0 .../elasticsearch/common/inject/internal/InternalContext.java | 0 .../elasticsearch/common/inject/internal/InternalFactory.java | 0 .../java/org/elasticsearch/common/inject/internal/Join.java | 0 .../common/inject/internal/LinkedBindingImpl.java | 0 .../common/inject/internal/LinkedProviderBindingImpl.java | 0 .../common/inject/internal/MatcherAndConverter.java | 0 .../org/elasticsearch/common/inject/internal/MoreTypes.java | 0 .../common/inject/internal/NullOutputException.java | 0 .../org/elasticsearch/common/inject/internal/Nullability.java | 0 .../org/elasticsearch/common/inject/internal/Nullable.java | 0 .../org/elasticsearch/common/inject/internal/Objects.java | 0 .../common/inject/internal/PrivateElementsImpl.java | 0 .../common/inject/internal/ProviderInstanceBindingImpl.java | 0 .../elasticsearch/common/inject/internal/ProviderMethod.java | 0 .../common/inject/internal/ProviderMethodsModule.java | 0 .../org/elasticsearch/common/inject/internal/Scoping.java | 0 .../elasticsearch/common/inject/internal/SourceProvider.java | 0 .../common/inject/internal/StackTraceElements.java | 0 .../org/elasticsearch/common/inject/internal/Stopwatch.java | 0 .../org/elasticsearch/common/inject/internal/Strings.java | 0 .../elasticsearch/common/inject/internal/ToStringBuilder.java | 0 .../common/inject/internal/UniqueAnnotations.java | 0 .../common/inject/internal/UnmodifiableIterator.java | 0 .../common/inject/internal/UntargettedBindingImpl.java | 0 .../elasticsearch/common/inject/internal/package-info.java | 0 .../elasticsearch/common/inject/matcher/AbstractMatcher.java | 0 .../java/org/elasticsearch/common/inject/matcher/Matcher.java | 0 .../org/elasticsearch/common/inject/matcher/Matchers.java | 0 .../org/elasticsearch/common/inject/matcher/package-info.java | 0 .../elasticsearch/common/inject/multibindings/Element.java | 0 .../elasticsearch/common/inject/multibindings/MapBinder.java | 0 .../common/inject/multibindings/Multibinder.java | 0 .../common/inject/multibindings/RealElement.java | 0 .../common/inject/multibindings/package-info.java | 0 .../main/java/org/elasticsearch/common/inject/name/Named.java | 0 .../java/org/elasticsearch/common/inject/name/NamedImpl.java | 0 .../main/java/org/elasticsearch/common/inject/name/Names.java | 0 .../org/elasticsearch/common/inject/name/package-info.java | 0 .../java/org/elasticsearch/common/inject/package-info.java | 0 .../common/inject/spi/BindingScopingVisitor.java | 0 .../elasticsearch/common/inject/spi/BindingTargetVisitor.java | 0 .../elasticsearch/common/inject/spi/ConstructorBinding.java | 0 .../common/inject/spi/ConvertedConstantBinding.java | 0 .../common/inject/spi/DefaultBindingScopingVisitor.java | 0 .../common/inject/spi/DefaultBindingTargetVisitor.java | 0 .../common/inject/spi/DefaultElementVisitor.java | 0 .../java/org/elasticsearch/common/inject/spi/Dependency.java | 0 .../java/org/elasticsearch/common/inject/spi/Element.java | 0 .../org/elasticsearch/common/inject/spi/ElementVisitor.java | 0 .../java/org/elasticsearch/common/inject/spi/Elements.java | 0 .../org/elasticsearch/common/inject/spi/ExposedBinding.java | 0 .../org/elasticsearch/common/inject/spi/HasDependencies.java | 0 .../elasticsearch/common/inject/spi/InjectionListener.java | 0 .../org/elasticsearch/common/inject/spi/InjectionPoint.java | 0 .../org/elasticsearch/common/inject/spi/InjectionRequest.java | 0 .../org/elasticsearch/common/inject/spi/InstanceBinding.java | 0 .../org/elasticsearch/common/inject/spi/LinkedKeyBinding.java | 0 .../common/inject/spi/MembersInjectorLookup.java | 0 .../java/org/elasticsearch/common/inject/spi/Message.java | 0 .../org/elasticsearch/common/inject/spi/PrivateElements.java | 0 .../org/elasticsearch/common/inject/spi/ProviderBinding.java | 0 .../common/inject/spi/ProviderInstanceBinding.java | 0 .../elasticsearch/common/inject/spi/ProviderKeyBinding.java | 0 .../org/elasticsearch/common/inject/spi/ProviderLookup.java | 0 .../common/inject/spi/ProviderWithDependencies.java | 0 .../org/elasticsearch/common/inject/spi/ScopeBinding.java | 0 .../common/inject/spi/StaticInjectionRequest.java | 0 .../org/elasticsearch/common/inject/spi/TypeConverter.java | 0 .../elasticsearch/common/inject/spi/TypeConverterBinding.java | 0 .../org/elasticsearch/common/inject/spi/TypeEncounter.java | 0 .../org/elasticsearch/common/inject/spi/TypeListener.java | 0 .../elasticsearch/common/inject/spi/TypeListenerBinding.java | 0 .../elasticsearch/common/inject/spi/UntargettedBinding.java | 0 .../org/elasticsearch/common/inject/spi/package-info.java | 0 .../java/org/elasticsearch/common/inject/util/Modules.java | 0 .../java/org/elasticsearch/common/inject/util/Providers.java | 0 .../main/java/org/elasticsearch/common/inject/util/Types.java | 0 .../org/elasticsearch/common/inject/util/package-info.java | 0 .../java/org/elasticsearch/common/io/BooleanStreamable.java | 0 .../main/java/org/elasticsearch/common/io/BytesStream.java | 0 .../main/java/org/elasticsearch/common/io/CachedStreams.java | 0 .../java/org/elasticsearch/common/io/CharSequenceReader.java | 0 .../org/elasticsearch/common/io/CompactObjectInputStream.java | 0 .../elasticsearch/common/io/CompactObjectOutputStream.java | 0 .../org/elasticsearch/common/io/FastByteArrayInputStream.java | 0 .../elasticsearch/common/io/FastByteArrayOutputStream.java | 0 .../java/org/elasticsearch/common/io/FastCharArrayReader.java | 0 .../java/org/elasticsearch/common/io/FastCharArrayWriter.java | 0 .../java/org/elasticsearch/common/io/FastStringReader.java | 0 .../org/elasticsearch/common/io/FileChannelInputStream.java | 0 .../java/org/elasticsearch/common/io/FileSystemUtils.java | 0 .../main/java/org/elasticsearch/common/io/Serializers.java | 0 .../main/java/org/elasticsearch/common/io/Streams.java | 0 .../elasticsearch/common/io/ThrowableObjectInputStream.java | 0 .../elasticsearch/common/io/ThrowableObjectOutputStream.java | 0 .../org/elasticsearch/common/io/stream/BytesStreamInput.java | 0 .../org/elasticsearch/common/io/stream/BytesStreamOutput.java | 0 .../org/elasticsearch/common/io/stream/CachedStreamInput.java | 0 .../elasticsearch/common/io/stream/CachedStreamOutput.java | 0 .../common/io/stream/DataOutputStreamOutput.java | 0 .../elasticsearch/common/io/stream/HandlesStreamInput.java | 0 .../elasticsearch/common/io/stream/HandlesStreamOutput.java | 0 .../common/io/stream/InputStreamStreamInput.java | 0 .../org/elasticsearch/common/io/stream/LZFStreamInput.java | 0 .../org/elasticsearch/common/io/stream/LZFStreamOutput.java | 0 .../org/elasticsearch/common/io/stream/LongStreamable.java | 0 .../java/org/elasticsearch/common/io/stream/StreamInput.java | 0 .../java/org/elasticsearch/common/io/stream/StreamOutput.java | 0 .../java/org/elasticsearch/common/io/stream/Streamable.java | 0 .../java/org/elasticsearch/common/io/stream/Streamables.java | 0 .../org/elasticsearch/common/io/stream/StringStreamable.java | 0 .../org/elasticsearch/common/io/stream/VoidStreamable.java | 0 .../main/java/org/elasticsearch/common/jline/ANSI.java | 0 .../main/java/org/elasticsearch/common/jna/CLibrary.java | 0 .../main/java/org/elasticsearch/common/jna/Natives.java | 0 .../elasticsearch/common/joda/FormatDateTimeFormatter.java | 0 .../main/java/org/elasticsearch/common/joda/Joda.java | 0 .../main/java/org/elasticsearch/common/lab/LongsLAB.java | 0 .../main/java/org/elasticsearch/common/lease/Releasable.java | 0 .../main/java/org/elasticsearch/common/logging/ESLogger.java | 0 .../org/elasticsearch/common/logging/ESLoggerFactory.java | 0 .../main/java/org/elasticsearch/common/logging/Loggers.java | 0 .../org/elasticsearch/common/logging/jdk/JdkESLogger.java | 0 .../elasticsearch/common/logging/jdk/JdkESLoggerFactory.java | 0 .../elasticsearch/common/logging/log4j/ConsoleAppender.java | 0 .../common/logging/log4j/JLinePatternLayout.java | 0 .../org/elasticsearch/common/logging/log4j/Log4jESLogger.java | 0 .../common/logging/log4j/Log4jESLoggerFactory.java | 0 .../elasticsearch/common/logging/log4j/LogConfigurator.java | 0 .../org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java | 0 .../common/logging/slf4j/Slf4jESLoggerFactory.java | 0 .../common/logging/support/AbstractESLogger.java | 0 .../common/logging/support/LoggerMessageFormat.java | 0 .../java/org/elasticsearch/common/lucene/Directories.java | 0 .../java/org/elasticsearch/common/lucene/DocumentBuilder.java | 0 .../java/org/elasticsearch/common/lucene/FieldBuilder.java | 0 .../org/elasticsearch/common/lucene/IndexCommitDelegate.java | 0 .../java/org/elasticsearch/common/lucene/IndexWriters.java | 0 .../org/elasticsearch/common/lucene/LoggerInfoStream.java | 0 .../main/java/org/elasticsearch/common/lucene/Lucene.java | 0 .../elasticsearch/common/lucene/MinimumScoreCollector.java | 0 .../java/org/elasticsearch/common/lucene/MultiCollector.java | 0 .../org/elasticsearch/common/lucene/ReaderSearcherHolder.java | 0 .../java/org/elasticsearch/common/lucene/all/AllEntries.java | 0 .../java/org/elasticsearch/common/lucene/all/AllField.java | 0 .../org/elasticsearch/common/lucene/all/AllTermQuery.java | 0 .../org/elasticsearch/common/lucene/all/AllTokenStream.java | 0 .../common/lucene/analysis/HTMLStripCharFilter.java | 0 .../org/elasticsearch/common/lucene/docset/AllDocSet.java | 0 .../org/elasticsearch/common/lucene/docset/AndDocIdSet.java | 0 .../org/elasticsearch/common/lucene/docset/AndDocSet.java | 0 .../elasticsearch/common/lucene/docset/DocIdSetCollector.java | 0 .../java/org/elasticsearch/common/lucene/docset/DocSet.java | 0 .../java/org/elasticsearch/common/lucene/docset/DocSets.java | 0 .../elasticsearch/common/lucene/docset/FixedBitDocSet.java | 0 .../org/elasticsearch/common/lucene/docset/GetDocSet.java | 0 .../org/elasticsearch/common/lucene/docset/NotDocIdSet.java | 0 .../org/elasticsearch/common/lucene/docset/NotDocSet.java | 0 .../org/elasticsearch/common/lucene/docset/OpenBitDocSet.java | 0 .../org/elasticsearch/common/lucene/docset/OrDocIdSet.java | 0 .../java/org/elasticsearch/common/lucene/docset/OrDocSet.java | 0 .../common/lucene/document/ResetFieldSelector.java | 0 .../common/lucene/document/SingleFieldSelector.java | 0 .../org/elasticsearch/common/lucene/search/AndFilter.java | 0 .../org/elasticsearch/common/lucene/search/EmptyScorer.java | 0 .../elasticsearch/common/lucene/search/FilteredCollector.java | 0 .../org/elasticsearch/common/lucene/search/LimitFilter.java | 0 .../common/lucene/search/MatchAllDocsFilter.java | 0 .../elasticsearch/common/lucene/search/MatchNoDocsQuery.java | 0 .../elasticsearch/common/lucene/search/MoreLikeThisQuery.java | 0 .../common/lucene/search/MultiPhrasePrefixQuery.java | 0 .../org/elasticsearch/common/lucene/search/NoCacheFilter.java | 0 .../org/elasticsearch/common/lucene/search/NoopCollector.java | 0 .../org/elasticsearch/common/lucene/search/NotFilter.java | 0 .../java/org/elasticsearch/common/lucene/search/OrFilter.java | 0 .../java/org/elasticsearch/common/lucene/search/Queries.java | 0 .../org/elasticsearch/common/lucene/search/TermFilter.java | 0 .../elasticsearch/common/lucene/search/XBooleanFilter.java | 0 .../common/lucene/search/function/BoostScoreFunction.java | 0 .../lucene/search/function/FiltersFunctionScoreQuery.java | 0 .../common/lucene/search/function/FunctionScoreQuery.java | 0 .../common/lucene/search/function/ScoreFunction.java | 0 .../common/lucene/store/InputStreamIndexInput.java | 0 .../elasticsearch/common/lucene/store/NullIndexOutput.java | 0 .../elasticsearch/common/lucene/store/SwitchDirectory.java | 0 .../common/lucene/store/ThreadSafeInputStreamIndexInput.java | 0 .../java/org/elasticsearch/common/lucene/uid/UidField.java | 0 .../common/lucene/versioned/ConcurrentVersionedMap.java | 0 .../common/lucene/versioned/ConcurrentVersionedMapLong.java | 0 .../common/lucene/versioned/NativeVersionedMap.java | 0 .../common/lucene/versioned/VersionedIndexReader.java | 0 .../elasticsearch/common/lucene/versioned/VersionedMap.java | 0 .../org/elasticsearch/common/math/MathRuntimeException.java | 0 .../main/java/org/elasticsearch/common/math/MathUtils.java | 0 .../java/org/elasticsearch/common/math/UnboxedMathUtils.java | 0 .../java/org/elasticsearch/common/metrics/CounterMetric.java | 0 .../main/java/org/elasticsearch/common/metrics/EWMA.java | 0 .../java/org/elasticsearch/common/metrics/MeanMetric.java | 0 .../java/org/elasticsearch/common/metrics/MeterMetric.java | 0 .../main/java/org/elasticsearch/common/metrics/Metric.java | 0 .../org/elasticsearch/common/netty/OpenChannelsHandler.java | 0 .../java/org/elasticsearch/common/network/NetworkModule.java | 0 .../java/org/elasticsearch/common/network/NetworkService.java | 0 .../java/org/elasticsearch/common/network/NetworkUtils.java | 0 .../main/java/org/elasticsearch/common/os/OsUtils.java | 0 .../main/java/org/elasticsearch/common/path/PathTrie.java | 0 .../elasticsearch/common/property/PropertyPlaceholder.java | 0 .../main/java/org/elasticsearch/common/regex/Regex.java | 0 .../org/elasticsearch/common/settings/ImmutableSettings.java | 0 .../common/settings/NoClassSettingsException.java | 0 .../main/java/org/elasticsearch/common/settings/Settings.java | 0 .../org/elasticsearch/common/settings/SettingsException.java | 0 .../org/elasticsearch/common/settings/SettingsFilter.java | 0 .../org/elasticsearch/common/settings/SettingsModule.java | 0 .../common/settings/loader/JsonSettingsLoader.java | 0 .../common/settings/loader/PropertiesSettingsLoader.java | 0 .../elasticsearch/common/settings/loader/SettingsLoader.java | 0 .../common/settings/loader/SettingsLoaderFactory.java | 0 .../common/settings/loader/YamlSettingsLoader.java | 0 .../elasticsearch/common/settings/loader/package-info.java | 0 .../java/org/elasticsearch/common/settings/package-info.java | 0 .../java/org/elasticsearch/common/thread/LoggingRunnable.java | 0 .../java/org/elasticsearch/common/thread/ThreadLocals.java | 0 .../org/elasticsearch/common/thread/ThreadNameDeterminer.java | 0 .../elasticsearch/common/thread/ThreadRenamingRunnable.java | 0 .../java/org/elasticsearch/common/timer/HashedWheelTimer.java | 0 .../main/java/org/elasticsearch/common/timer/Timeout.java | 0 .../main/java/org/elasticsearch/common/timer/Timer.java | 0 .../main/java/org/elasticsearch/common/timer/TimerTask.java | 0 .../elasticsearch/common/transport/BoundTransportAddress.java | 0 .../elasticsearch/common/transport/DummyTransportAddress.java | 0 .../common/transport/InetSocketTransportAddress.java | 0 .../elasticsearch/common/transport/LocalTransportAddress.java | 0 .../common/transport/NetworkExceptionHelper.java | 0 .../java/org/elasticsearch/common/transport/PortsRange.java | 0 .../org/elasticsearch/common/transport/TransportAddress.java | 0 .../common/transport/TransportAddressSerializers.java | 0 .../elasticsearch/common/trove/ExtTDoubleObjectHashMap.java | 0 .../main/java/org/elasticsearch/common/trove/ExtTHashMap.java | 0 .../java/org/elasticsearch/common/trove/ExtTIntArrayList.java | 0 .../org/elasticsearch/common/trove/ExtTLongObjectHashMap.java | 0 .../org/elasticsearch/common/trove/ExtTObjectIntHasMap.java | 0 .../common/trove/StringIdentityHashingStrategy.java | 0 .../main/java/org/elasticsearch/common/unit/ByteSizeUnit.java | 0 .../java/org/elasticsearch/common/unit/ByteSizeValue.java | 0 .../main/java/org/elasticsearch/common/unit/DistanceUnit.java | 0 .../main/java/org/elasticsearch/common/unit/Percent.java | 0 .../main/java/org/elasticsearch/common/unit/SizeUnit.java | 0 .../main/java/org/elasticsearch/common/unit/SizeValue.java | 0 .../main/java/org/elasticsearch/common/unit/TimeValue.java | 0 .../common/util/concurrent/ConcurrentCollections.java | 0 .../common/util/concurrent/ConcurrentHashMapLong.java | 0 .../common/util/concurrent/ConcurrentIdentityHashMap.java | 0 .../common/util/concurrent/ConcurrentMapLong.java | 0 .../common/util/concurrent/ConcurrentSafeArray.java | 0 .../elasticsearch/common/util/concurrent/CopyOnWriteMap.java | 0 .../common/util/concurrent/DynamicExecutors.java | 0 .../common/util/concurrent/DynamicThreadPoolExecutor.java | 0 .../org/elasticsearch/common/util/concurrent/EsExecutors.java | 0 .../org/elasticsearch/common/util/concurrent/Immutable.java | 0 .../elasticsearch/common/util/concurrent/NotThreadSafe.java | 0 .../elasticsearch/common/util/concurrent/ThreadBarrier.java | 0 .../org/elasticsearch/common/util/concurrent/ThreadSafe.java | 0 .../common/util/concurrent/TransferThreadPoolExecutor.java | 0 .../util/concurrent/UncategorizedExecutionException.java | 0 .../common/util/concurrent/resource/AcquirableResource.java | 0 .../util/concurrent/resource/AcquirableResourceFactory.java | 0 .../util/concurrent/resource/BlockingAcquirableResource.java | 0 .../concurrent/resource/NonBlockingAcquirableResource.java | 0 .../java/org/elasticsearch/common/xcontent/ToXContent.java | 0 .../main/java/org/elasticsearch/common/xcontent/XContent.java | 0 .../org/elasticsearch/common/xcontent/XContentBuilder.java | 0 .../elasticsearch/common/xcontent/XContentBuilderString.java | 0 .../org/elasticsearch/common/xcontent/XContentFactory.java | 0 .../org/elasticsearch/common/xcontent/XContentGenerator.java | 0 .../org/elasticsearch/common/xcontent/XContentHelper.java | 0 .../org/elasticsearch/common/xcontent/XContentParser.java | 0 .../org/elasticsearch/common/xcontent/XContentString.java | 0 .../java/org/elasticsearch/common/xcontent/XContentType.java | 0 .../org/elasticsearch/common/xcontent/json/JsonXContent.java | 0 .../common/xcontent/json/JsonXContentGenerator.java | 0 .../common/xcontent/json/JsonXContentParser.java | 0 .../elasticsearch/common/xcontent/smile/SmileXContent.java | 0 .../common/xcontent/smile/SmileXContentGenerator.java | 0 .../common/xcontent/smile/SmileXContentParser.java | 0 .../common/xcontent/support/AbstractXContentGenerator.java | 0 .../common/xcontent/support/AbstractXContentParser.java | 0 .../common/xcontent/support/XContentMapConverter.java | 0 .../common/xcontent/support/XContentMapValues.java | 0 .../main/java/org/elasticsearch/discovery/Discovery.java | 0 .../java/org/elasticsearch/discovery/DiscoveryException.java | 0 .../java/org/elasticsearch/discovery/DiscoveryModule.java | 0 .../java/org/elasticsearch/discovery/DiscoveryService.java | 0 .../discovery/InitialStateDiscoveryListener.java | 0 .../elasticsearch/discovery/MasterNotDiscoveredException.java | 0 .../org/elasticsearch/discovery/local/LocalDiscovery.java | 0 .../elasticsearch/discovery/local/LocalDiscoveryModule.java | 0 .../elasticsearch/discovery/zen/DiscoveryNodesProvider.java | 0 .../java/org/elasticsearch/discovery/zen/ZenDiscovery.java | 0 .../org/elasticsearch/discovery/zen/ZenDiscoveryModule.java | 0 .../elasticsearch/discovery/zen/elect/ElectMasterService.java | 0 .../elasticsearch/discovery/zen/fd/MasterFaultDetection.java | 0 .../elasticsearch/discovery/zen/fd/NodesFaultDetection.java | 0 .../discovery/zen/membership/MembershipAction.java | 0 .../java/org/elasticsearch/discovery/zen/ping/ZenPing.java | 0 .../elasticsearch/discovery/zen/ping/ZenPingException.java | 0 .../org/elasticsearch/discovery/zen/ping/ZenPingService.java | 0 .../discovery/zen/ping/multicast/MulticastZenPing.java | 0 .../discovery/zen/ping/unicast/UnicastHostsProvider.java | 0 .../discovery/zen/ping/unicast/UnicastZenPing.java | 0 .../discovery/zen/publish/PublishClusterStateAction.java | 0 .../main/java/org/elasticsearch/env/Environment.java | 0 .../main/java/org/elasticsearch/env/EnvironmentModule.java | 0 .../org/elasticsearch/env/FailedToResolveConfigException.java | 0 .../main/java/org/elasticsearch/env/NodeEnvironment.java | 0 .../java/org/elasticsearch/env/NodeEnvironmentModule.java | 0 .../main/java/org/elasticsearch/gateway/Gateway.java | 0 .../main/java/org/elasticsearch/gateway/GatewayException.java | 0 .../main/java/org/elasticsearch/gateway/GatewayModule.java | 0 .../main/java/org/elasticsearch/gateway/GatewayService.java | 0 .../gateway/blobstore/BlobReuseExistingGatewayAllocator.java | 0 .../org/elasticsearch/gateway/blobstore/BlobStoreGateway.java | 0 .../gateway/blobstore/BlobStoreGatewayModule.java | 0 .../main/java/org/elasticsearch/gateway/fs/FsGateway.java | 0 .../java/org/elasticsearch/gateway/fs/FsGatewayModule.java | 0 .../java/org/elasticsearch/gateway/local/LocalGateway.java | 0 .../elasticsearch/gateway/local/LocalGatewayAllocator.java | 0 .../elasticsearch/gateway/local/LocalGatewayMetaState.java | 0 .../org/elasticsearch/gateway/local/LocalGatewayModule.java | 0 .../gateway/local/LocalGatewayStartedShards.java | 0 .../gateway/local/TransportNodesListGatewayMetaState.java | 0 .../gateway/local/TransportNodesListGatewayStartedShards.java | 0 .../main/java/org/elasticsearch/gateway/none/NoneGateway.java | 0 .../org/elasticsearch/gateway/none/NoneGatewayAllocator.java | 0 .../org/elasticsearch/gateway/none/NoneGatewayModule.java | 0 .../elasticsearch/gateway/shared/SharedStorageGateway.java | 0 .../main/java/org/elasticsearch/http/BindHttpException.java | 0 .../main/java/org/elasticsearch/http/HttpChannel.java | 0 .../main/java/org/elasticsearch/http/HttpException.java | 0 .../main/java/org/elasticsearch/http/HttpInfo.java | 0 .../main/java/org/elasticsearch/http/HttpRequest.java | 0 .../main/java/org/elasticsearch/http/HttpResponse.java | 0 .../main/java/org/elasticsearch/http/HttpServer.java | 0 .../main/java/org/elasticsearch/http/HttpServerAdapter.java | 0 .../main/java/org/elasticsearch/http/HttpServerModule.java | 0 .../main/java/org/elasticsearch/http/HttpServerTransport.java | 0 .../main/java/org/elasticsearch/http/HttpStats.java | 0 .../java/org/elasticsearch/http/netty/HttpRequestHandler.java | 0 .../java/org/elasticsearch/http/netty/NettyHttpChannel.java | 0 .../java/org/elasticsearch/http/netty/NettyHttpRequest.java | 0 .../elasticsearch/http/netty/NettyHttpServerTransport.java | 0 .../http/netty/NettyHttpServerTransportModule.java | 0 .../java/org/elasticsearch/index/AbstractIndexComponent.java | 0 .../java/org/elasticsearch/index/AlreadyExpiredException.java | 0 .../java/org/elasticsearch/index/CloseableIndexComponent.java | 0 .../src => src}/main/java/org/elasticsearch/index/Index.java | 0 .../main/java/org/elasticsearch/index/IndexComponent.java | 0 .../main/java/org/elasticsearch/index/IndexException.java | 0 .../main/java/org/elasticsearch/index/IndexModule.java | 0 .../main/java/org/elasticsearch/index/IndexNameModule.java | 0 .../java/org/elasticsearch/index/IndexServiceManagement.java | 0 .../elasticsearch/index/IndexShardAlreadyExistsException.java | 0 .../org/elasticsearch/index/IndexShardMissingException.java | 0 .../main/java/org/elasticsearch/index/LocalNodeId.java | 0 .../main/java/org/elasticsearch/index/LocalNodeIdModule.java | 0 .../main/java/org/elasticsearch/index/VersionType.java | 0 .../main/java/org/elasticsearch/index/aliases/IndexAlias.java | 0 .../org/elasticsearch/index/aliases/IndexAliasesService.java | 0 .../index/aliases/IndexAliasesServiceModule.java | 0 .../index/analysis/ASCIIFoldingTokenFilterFactory.java | 0 .../index/analysis/AbstractCharFilterFactory.java | 0 .../index/analysis/AbstractIndexAnalyzerProvider.java | 0 .../index/analysis/AbstractTokenFilterFactory.java | 0 .../index/analysis/AbstractTokenizerFactory.java | 0 .../main/java/org/elasticsearch/index/analysis/Analysis.java | 0 .../java/org/elasticsearch/index/analysis/AnalysisModule.java | 0 .../org/elasticsearch/index/analysis/AnalysisService.java | 0 .../index/analysis/AnalysisSettingsRequired.java | 0 .../org/elasticsearch/index/analysis/AnalyzerProvider.java | 0 .../elasticsearch/index/analysis/AnalyzerProviderFactory.java | 0 .../java/org/elasticsearch/index/analysis/AnalyzerScope.java | 0 .../elasticsearch/index/analysis/ArabicAnalyzerProvider.java | 0 .../index/analysis/ArabicStemTokenFilterFactory.java | 0 .../index/analysis/ArmenianAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/BasqueAnalyzerProvider.java | 0 .../index/analysis/BrazilianAnalyzerProvider.java | 0 .../index/analysis/BrazilianStemTokenFilterFactory.java | 0 .../index/analysis/BulgarianAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/CatalanAnalyzerProvider.java | 0 .../org/elasticsearch/index/analysis/CharFilterFactory.java | 0 .../index/analysis/CharFilterFactoryFactory.java | 0 .../elasticsearch/index/analysis/ChineseAnalyzerProvider.java | 0 .../org/elasticsearch/index/analysis/CjkAnalyzerProvider.java | 0 .../java/org/elasticsearch/index/analysis/CustomAnalyzer.java | 0 .../elasticsearch/index/analysis/CustomAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/CzechAnalyzerProvider.java | 0 .../index/analysis/CzechStemTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/DanishAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/DutchAnalyzerProvider.java | 0 .../index/analysis/DutchStemTokenFilterFactory.java | 0 .../index/analysis/EdgeNGramTokenFilterFactory.java | 0 .../index/analysis/EdgeNGramTokenizerFactory.java | 0 .../index/analysis/ElisionTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/EnglishAnalyzerProvider.java | 0 .../org/elasticsearch/index/analysis/FieldNameAnalyzer.java | 0 .../elasticsearch/index/analysis/FinnishAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/FrenchAnalyzerProvider.java | 0 .../index/analysis/FrenchStemTokenFilterFactory.java | 0 .../index/analysis/GalicianAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/GermanAnalyzerProvider.java | 0 .../index/analysis/GermanStemTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/GreekAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/HindiAnalyzerProvider.java | 0 .../index/analysis/HtmlStripCharFilterFactory.java | 0 .../index/analysis/HungarianAnalyzerProvider.java | 0 .../index/analysis/IndonesianAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/ItalianAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/KStemTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/KeywordAnalyzerProvider.java | 0 .../index/analysis/KeywordMarkerTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/KeywordTokenizerFactory.java | 0 .../index/analysis/LengthTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/LetterTokenizerFactory.java | 0 .../index/analysis/LowerCaseTokenFilterFactory.java | 0 .../index/analysis/LowerCaseTokenizerFactory.java | 0 .../index/analysis/MappingCharFilterFactory.java | 0 .../elasticsearch/index/analysis/NGramTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/NGramTokenizerFactory.java | 0 .../java/org/elasticsearch/index/analysis/NamedAnalyzer.java | 0 .../index/analysis/NorwegianAnalyzerProvider.java | 0 .../org/elasticsearch/index/analysis/NumericAnalyzer.java | 0 .../org/elasticsearch/index/analysis/NumericDateAnalyzer.java | 0 .../elasticsearch/index/analysis/NumericDateTokenizer.java | 0 .../elasticsearch/index/analysis/NumericDoubleAnalyzer.java | 0 .../elasticsearch/index/analysis/NumericDoubleTokenizer.java | 0 .../elasticsearch/index/analysis/NumericFloatAnalyzer.java | 0 .../elasticsearch/index/analysis/NumericFloatTokenizer.java | 0 .../elasticsearch/index/analysis/NumericIntegerAnalyzer.java | 0 .../elasticsearch/index/analysis/NumericIntegerTokenizer.java | 0 .../org/elasticsearch/index/analysis/NumericLongAnalyzer.java | 0 .../elasticsearch/index/analysis/NumericLongTokenizer.java | 0 .../org/elasticsearch/index/analysis/NumericTokenizer.java | 0 .../index/analysis/PathHierarchyTokenizerFactory.java | 0 .../elasticsearch/index/analysis/PatternAnalyzerProvider.java | 0 .../index/analysis/PatternReplaceTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/PatternTokenizerFactory.java | 0 .../elasticsearch/index/analysis/PersianAnalyzerProvider.java | 0 .../index/analysis/PorterStemTokenFilterFactory.java | 0 .../index/analysis/PortugueseAnalyzerProvider.java | 0 .../index/analysis/PositionIncrementGapAnalyzer.java | 0 .../index/analysis/PreBuiltAnalyzerProvider.java | 0 .../index/analysis/PreBuiltAnalyzerProviderFactory.java | 0 .../index/analysis/PreBuiltCharFilterFactoryFactory.java | 0 .../index/analysis/PreBuiltTokenFilterFactoryFactory.java | 0 .../index/analysis/PreBuiltTokenizerFactoryFactory.java | 0 .../index/analysis/ReverseTokenFilterFactory.java | 0 .../index/analysis/RomanianAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/RussianAnalyzerProvider.java | 0 .../index/analysis/RussianStemTokenFilterFactory.java | 0 .../index/analysis/ShingleTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/SimpleAnalyzerProvider.java | 0 .../index/analysis/SnowballAnalyzerProvider.java | 0 .../index/analysis/SnowballTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/SpanishAnalyzerProvider.java | 0 .../index/analysis/StandardAnalyzerProvider.java | 0 .../index/analysis/StandardHtmlStripAnalyzer.java | 0 .../index/analysis/StandardHtmlStripAnalyzerProvider.java | 0 .../index/analysis/StandardTokenFilterFactory.java | 0 .../index/analysis/StandardTokenizerFactory.java | 0 .../index/analysis/StemmerOverrideTokenFilterFactory.java | 0 .../index/analysis/StemmerTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/StopAnalyzerProvider.java | 0 .../elasticsearch/index/analysis/StopTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/SwedishAnalyzerProvider.java | 0 .../index/analysis/SynonymTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/ThaiAnalyzerProvider.java | 0 .../org/elasticsearch/index/analysis/TokenFilterFactory.java | 0 .../index/analysis/TokenFilterFactoryFactory.java | 0 .../org/elasticsearch/index/analysis/TokenizerFactory.java | 0 .../elasticsearch/index/analysis/TokenizerFactoryFactory.java | 0 .../index/analysis/TruncateTokenFilterFactory.java | 0 .../elasticsearch/index/analysis/TurkishAnalyzerProvider.java | 0 .../index/analysis/UAX29URLEmailTokenizerFactory.java | 0 .../index/analysis/UniqueTokenFilterFactory.java | 0 .../index/analysis/WhitespaceAnalyzerProvider.java | 0 .../index/analysis/WhitespaceTokenizerFactory.java | 0 .../index/analysis/WordDelimiterTokenFilterFactory.java | 0 .../compound/AbstractCompoundWordTokenFilterFactory.java | 0 .../compound/DictionaryCompoundWordTokenFilterFactory.java | 0 .../compound/HyphenationCompoundWordTokenFilterFactory.java | 0 .../index/analysis/phonetic/DoubleMetaphoneFilter.java | 0 .../elasticsearch/index/analysis/phonetic/PhoneticFilter.java | 0 .../index/analysis/phonetic/PhoneticTokenFilterFactory.java | 0 .../main/java/org/elasticsearch/index/cache/CacheStats.java | 0 .../main/java/org/elasticsearch/index/cache/IndexCache.java | 0 .../java/org/elasticsearch/index/cache/IndexCacheModule.java | 0 .../java/org/elasticsearch/index/cache/bloom/BloomCache.java | 0 .../org/elasticsearch/index/cache/bloom/BloomCacheModule.java | 0 .../elasticsearch/index/cache/bloom/none/NoneBloomCache.java | 0 .../index/cache/bloom/simple/SimpleBloomCache.java | 0 .../elasticsearch/index/cache/field/data/FieldDataCache.java | 0 .../index/cache/field/data/FieldDataCacheModule.java | 0 .../index/cache/field/data/none/NoneFieldDataCache.java | 0 .../cache/field/data/resident/ResidentFieldDataCache.java | 0 .../index/cache/field/data/soft/SoftFieldDataCache.java | 0 .../data/support/AbstractConcurrentMapFieldDataCache.java | 0 .../index/cache/field/data/weak/WeakFieldDataCache.java | 0 .../org/elasticsearch/index/cache/filter/FilterCache.java | 0 .../elasticsearch/index/cache/filter/FilterCacheModule.java | 0 .../index/cache/filter/node/NodeFilterCache.java | 0 .../index/cache/filter/none/NoneFilterCache.java | 0 .../index/cache/filter/resident/ResidentFilterCache.java | 0 .../index/cache/filter/soft/SoftFilterCache.java | 0 .../filter/support/AbstractConcurrentMapFilterCache.java | 0 .../cache/filter/support/AbstractWeightedFilterCache.java | 0 .../index/cache/filter/support/CacheKeyFilter.java | 0 .../index/cache/filter/support/FilterCacheValue.java | 0 .../index/cache/filter/weak/WeakFilterCache.java | 0 .../main/java/org/elasticsearch/index/cache/id/IdCache.java | 0 .../java/org/elasticsearch/index/cache/id/IdCacheModule.java | 0 .../java/org/elasticsearch/index/cache/id/IdReaderCache.java | 0 .../org/elasticsearch/index/cache/id/IdReaderTypeCache.java | 0 .../elasticsearch/index/cache/id/simple/SimpleIdCache.java | 0 .../index/cache/id/simple/SimpleIdReaderCache.java | 0 .../index/cache/id/simple/SimpleIdReaderTypeCache.java | 0 .../index/cache/query/parser/QueryParserCache.java | 0 .../index/cache/query/parser/QueryParserCacheModule.java | 0 .../index/cache/query/parser/none/NoneQueryParserCache.java | 0 .../index/cache/query/parser/soft/SoftQueryParserCache.java | 0 .../query/parser/support/AbstractJvmQueryParserCache.java | 0 .../index/cache/query/parser/weak/WeakQueryParserCache.java | 0 .../index/deletionpolicy/DeletionPolicyModule.java | 0 .../index/deletionpolicy/KeepLastNDeletionPolicy.java | 0 .../index/deletionpolicy/KeepOnlyLastDeletionPolicy.java | 0 .../index/deletionpolicy/SnapshotDeletionPolicy.java | 0 .../index/deletionpolicy/SnapshotIndexCommit.java | 0 .../index/deletionpolicy/SnapshotIndexCommits.java | 0 .../org/elasticsearch/index/engine/CloseEngineException.java | 0 .../index/engine/CreateFailedEngineException.java | 0 .../index/engine/DeleteByQueryFailedEngineException.java | 0 .../index/engine/DeleteFailedEngineException.java | 0 .../index/engine/DocumentAlreadyExistsEngineException.java | 0 .../main/java/org/elasticsearch/index/engine/Engine.java | 0 .../index/engine/EngineAlreadyStartedException.java | 0 .../org/elasticsearch/index/engine/EngineClosedException.java | 0 .../index/engine/EngineCreationFailureException.java | 0 .../java/org/elasticsearch/index/engine/EngineException.java | 0 .../java/org/elasticsearch/index/engine/EngineModule.java | 0 .../index/engine/FlushFailedEngineException.java | 0 .../index/engine/FlushNotAllowedEngineException.java | 0 .../index/engine/IgnoreOnRecoveryEngineException.java | 0 .../main/java/org/elasticsearch/index/engine/IndexEngine.java | 0 .../org/elasticsearch/index/engine/IndexEngineModule.java | 0 .../index/engine/IndexFailedEngineException.java | 0 .../index/engine/OptimizeFailedEngineException.java | 0 .../elasticsearch/index/engine/RecoveryEngineException.java | 0 .../index/engine/RefreshFailedEngineException.java | 0 .../index/engine/RollbackFailedEngineException.java | 0 .../index/engine/RollbackNotAllowedEngineException.java | 0 .../main/java/org/elasticsearch/index/engine/Segment.java | 0 .../index/engine/SnapshotFailedEngineException.java | 0 .../index/engine/VersionConflictEngineException.java | 0 .../org/elasticsearch/index/engine/robin/RobinEngine.java | 0 .../elasticsearch/index/engine/robin/RobinEngineModule.java | 0 .../elasticsearch/index/engine/robin/RobinIndexEngine.java | 0 .../index/engine/robin/RobinIndexEngineModule.java | 0 .../java/org/elasticsearch/index/field/data/DocFieldData.java | 0 .../java/org/elasticsearch/index/field/data/FieldData.java | 0 .../org/elasticsearch/index/field/data/FieldDataType.java | 0 .../elasticsearch/index/field/data/NumericDocFieldData.java | 0 .../org/elasticsearch/index/field/data/NumericFieldData.java | 0 .../index/field/data/bytes/ByteDocFieldData.java | 0 .../elasticsearch/index/field/data/bytes/ByteFieldData.java | 0 .../index/field/data/bytes/ByteFieldDataComparator.java | 0 .../field/data/bytes/ByteFieldDataMissingComparator.java | 0 .../index/field/data/bytes/ByteFieldDataType.java | 0 .../index/field/data/bytes/MultiValueByteFieldData.java | 0 .../index/field/data/bytes/SingleValueByteFieldData.java | 0 .../index/field/data/doubles/DoubleDocFieldData.java | 0 .../index/field/data/doubles/DoubleFieldData.java | 0 .../index/field/data/doubles/DoubleFieldDataComparator.java | 0 .../field/data/doubles/DoubleFieldDataMissingComparator.java | 0 .../index/field/data/doubles/DoubleFieldDataType.java | 0 .../index/field/data/doubles/MultiValueDoubleFieldData.java | 0 .../index/field/data/doubles/SingleValueDoubleFieldData.java | 0 .../index/field/data/floats/FloatDocFieldData.java | 0 .../elasticsearch/index/field/data/floats/FloatFieldData.java | 0 .../index/field/data/floats/FloatFieldDataComparator.java | 0 .../field/data/floats/FloatFieldDataMissingComparator.java | 0 .../index/field/data/floats/FloatFieldDataType.java | 0 .../index/field/data/floats/MultiValueFloatFieldData.java | 0 .../index/field/data/floats/SingleValueFloatFieldData.java | 0 .../elasticsearch/index/field/data/ints/IntDocFieldData.java | 0 .../org/elasticsearch/index/field/data/ints/IntFieldData.java | 0 .../index/field/data/ints/IntFieldDataComparator.java | 0 .../index/field/data/ints/IntFieldDataMissingComparator.java | 0 .../elasticsearch/index/field/data/ints/IntFieldDataType.java | 0 .../index/field/data/ints/MultiValueIntFieldData.java | 0 .../index/field/data/ints/SingleValueIntFieldData.java | 0 .../index/field/data/longs/LongDocFieldData.java | 0 .../elasticsearch/index/field/data/longs/LongFieldData.java | 0 .../index/field/data/longs/LongFieldDataComparator.java | 0 .../field/data/longs/LongFieldDataMissingComparator.java | 0 .../index/field/data/longs/LongFieldDataType.java | 0 .../index/field/data/longs/MultiValueLongFieldData.java | 0 .../index/field/data/longs/SingleValueLongFieldData.java | 0 .../index/field/data/shorts/MultiValueShortFieldData.java | 0 .../index/field/data/shorts/ShortDocFieldData.java | 0 .../elasticsearch/index/field/data/shorts/ShortFieldData.java | 0 .../index/field/data/shorts/ShortFieldDataComparator.java | 0 .../field/data/shorts/ShortFieldDataMissingComparator.java | 0 .../index/field/data/shorts/ShortFieldDataType.java | 0 .../index/field/data/shorts/SingleValueShortFieldData.java | 0 .../index/field/data/strings/MultiValueStringFieldData.java | 0 .../index/field/data/strings/SingleValueStringFieldData.java | 0 .../index/field/data/strings/StringDocFieldData.java | 0 .../index/field/data/strings/StringFieldData.java | 0 .../index/field/data/strings/StringFieldDataType.java | 0 .../field/data/strings/StringOrdValFieldDataComparator.java | 0 .../field/data/strings/StringValFieldDataComparator.java | 0 .../index/field/data/support/FieldDataLoader.java | 0 .../index/field/data/support/NumericFieldDataComparator.java | 0 .../function/sort/DoubleFieldsFunctionDataComparator.java | 0 .../function/sort/StringFieldsFunctionDataComparator.java | 0 .../main/java/org/elasticsearch/index/flush/FlushStats.java | 0 .../java/org/elasticsearch/index/gateway/CommitPoint.java | 0 .../java/org/elasticsearch/index/gateway/CommitPoints.java | 0 .../index/gateway/IgnoreGatewayRecoveryException.java | 0 .../java/org/elasticsearch/index/gateway/IndexGateway.java | 0 .../org/elasticsearch/index/gateway/IndexGatewayModule.java | 0 .../org/elasticsearch/index/gateway/IndexShardGateway.java | 0 .../index/gateway/IndexShardGatewayException.java | 0 .../elasticsearch/index/gateway/IndexShardGatewayModule.java | 0 .../index/gateway/IndexShardGatewayRecoveryException.java | 0 .../elasticsearch/index/gateway/IndexShardGatewayService.java | 0 .../gateway/IndexShardGatewaySnapshotFailedException.java | 0 .../gateway/IndexShardGatewaySnapshotNotAllowedException.java | 0 .../java/org/elasticsearch/index/gateway/RecoveryStatus.java | 0 .../java/org/elasticsearch/index/gateway/SnapshotStatus.java | 0 .../index/gateway/blobstore/BlobStoreIndexGateway.java | 0 .../index/gateway/blobstore/BlobStoreIndexShardGateway.java | 0 .../org/elasticsearch/index/gateway/fs/FsIndexGateway.java | 0 .../elasticsearch/index/gateway/fs/FsIndexGatewayModule.java | 0 .../elasticsearch/index/gateway/fs/FsIndexShardGateway.java | 0 .../elasticsearch/index/gateway/local/LocalIndexGateway.java | 0 .../index/gateway/local/LocalIndexGatewayModule.java | 0 .../index/gateway/local/LocalIndexShardGateway.java | 0 .../elasticsearch/index/gateway/none/NoneIndexGateway.java | 0 .../index/gateway/none/NoneIndexGatewayModule.java | 0 .../index/gateway/none/NoneIndexShardGateway.java | 0 .../main/java/org/elasticsearch/index/get/GetField.java | 0 .../main/java/org/elasticsearch/index/get/GetResult.java | 0 .../main/java/org/elasticsearch/index/get/GetStats.java | 0 .../main/java/org/elasticsearch/index/get/ShardGetModule.java | 0 .../java/org/elasticsearch/index/get/ShardGetService.java | 0 .../index/indexing/IndexingOperationListener.java | 0 .../java/org/elasticsearch/index/indexing/IndexingStats.java | 0 .../org/elasticsearch/index/indexing/ShardIndexingModule.java | 0 .../elasticsearch/index/indexing/ShardIndexingService.java | 0 .../main/java/org/elasticsearch/index/mapper/ContentPath.java | 0 .../org/elasticsearch/index/mapper/DocumentFieldMappers.java | 0 .../java/org/elasticsearch/index/mapper/DocumentMapper.java | 0 .../org/elasticsearch/index/mapper/DocumentMapperParser.java | 0 .../index/mapper/FailedToGenerateSourceMapperException.java | 0 .../main/java/org/elasticsearch/index/mapper/FieldMapper.java | 0 .../org/elasticsearch/index/mapper/FieldMapperListener.java | 0 .../java/org/elasticsearch/index/mapper/FieldMappers.java | 0 .../java/org/elasticsearch/index/mapper/InternalMapper.java | 0 .../main/java/org/elasticsearch/index/mapper/Mapper.java | 0 .../java/org/elasticsearch/index/mapper/MapperBuilders.java | 0 .../index/mapper/MapperCompressionException.java | 0 .../java/org/elasticsearch/index/mapper/MapperException.java | 0 .../elasticsearch/index/mapper/MapperParsingException.java | 0 .../java/org/elasticsearch/index/mapper/MapperService.java | 0 .../org/elasticsearch/index/mapper/MapperServiceModule.java | 0 .../java/org/elasticsearch/index/mapper/MergeContext.java | 0 .../org/elasticsearch/index/mapper/MergeMappingException.java | 0 .../org/elasticsearch/index/mapper/ObjectMapperListener.java | 0 .../java/org/elasticsearch/index/mapper/ObjectMappers.java | 0 .../java/org/elasticsearch/index/mapper/ParseContext.java | 0 .../java/org/elasticsearch/index/mapper/ParsedDocument.java | 0 .../main/java/org/elasticsearch/index/mapper/RootMapper.java | 0 .../java/org/elasticsearch/index/mapper/SourceToParse.java | 0 .../index/mapper/StrictDynamicMappingException.java | 0 .../main/java/org/elasticsearch/index/mapper/Uid.java | 0 .../elasticsearch/index/mapper/core/AbstractFieldMapper.java | 0 .../elasticsearch/index/mapper/core/BinaryFieldMapper.java | 0 .../elasticsearch/index/mapper/core/BooleanFieldMapper.java | 0 .../org/elasticsearch/index/mapper/core/ByteFieldMapper.java | 0 .../org/elasticsearch/index/mapper/core/DateFieldMapper.java | 0 .../elasticsearch/index/mapper/core/DoubleFieldMapper.java | 0 .../org/elasticsearch/index/mapper/core/FloatFieldMapper.java | 0 .../elasticsearch/index/mapper/core/IntegerFieldMapper.java | 0 .../org/elasticsearch/index/mapper/core/LongFieldMapper.java | 0 .../elasticsearch/index/mapper/core/NumberFieldMapper.java | 0 .../org/elasticsearch/index/mapper/core/ShortFieldMapper.java | 0 .../elasticsearch/index/mapper/core/StringFieldMapper.java | 0 .../java/org/elasticsearch/index/mapper/core/TypeParsers.java | 0 .../java/org/elasticsearch/index/mapper/default-mapping.json | 0 .../java/org/elasticsearch/index/mapper/geo/GeoPoint.java | 0 .../elasticsearch/index/mapper/geo/GeoPointDocFieldData.java | 0 .../org/elasticsearch/index/mapper/geo/GeoPointFieldData.java | 0 .../elasticsearch/index/mapper/geo/GeoPointFieldDataType.java | 0 .../elasticsearch/index/mapper/geo/GeoPointFieldMapper.java | 0 .../index/mapper/geo/MultiValueGeoPointFieldData.java | 0 .../index/mapper/geo/SingleValueGeoPointFieldData.java | 0 .../elasticsearch/index/mapper/internal/AllFieldMapper.java | 0 .../elasticsearch/index/mapper/internal/AnalyzerMapper.java | 0 .../elasticsearch/index/mapper/internal/BoostFieldMapper.java | 0 .../elasticsearch/index/mapper/internal/IdFieldMapper.java | 0 .../elasticsearch/index/mapper/internal/IndexFieldMapper.java | 0 .../index/mapper/internal/ParentFieldMapper.java | 0 .../index/mapper/internal/RoutingFieldMapper.java | 0 .../elasticsearch/index/mapper/internal/SizeFieldMapper.java | 0 .../index/mapper/internal/SourceFieldMapper.java | 0 .../index/mapper/internal/SourceFieldSelector.java | 0 .../elasticsearch/index/mapper/internal/TTLFieldMapper.java | 0 .../index/mapper/internal/TimestampFieldMapper.java | 0 .../elasticsearch/index/mapper/internal/TypeFieldMapper.java | 0 .../elasticsearch/index/mapper/internal/UidFieldMapper.java | 0 .../java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java | 0 .../index/mapper/multifield/MultiFieldMapper.java | 0 .../index/mapper/object/ArrayValueMapperParser.java | 0 .../elasticsearch/index/mapper/object/DynamicTemplate.java | 0 .../org/elasticsearch/index/mapper/object/ObjectMapper.java | 0 .../elasticsearch/index/mapper/object/RootObjectMapper.java | 0 .../index/mapper/selector/AllButSourceFieldSelector.java | 0 .../index/mapper/selector/FieldMappersFieldSelector.java | 0 .../index/mapper/selector/UidAndSourceFieldSelector.java | 0 .../elasticsearch/index/mapper/selector/UidFieldSelector.java | 0 .../main/java/org/elasticsearch/index/merge/MergeStats.java | 0 .../elasticsearch/index/merge/policy/EnableMergePolicy.java | 0 .../index/merge/policy/LogByteSizeMergePolicyProvider.java | 0 .../index/merge/policy/LogDocMergePolicyProvider.java | 0 .../elasticsearch/index/merge/policy/MergePolicyModule.java | 0 .../elasticsearch/index/merge/policy/MergePolicyProvider.java | 0 .../index/merge/policy/TieredMergePolicyProvider.java | 0 .../merge/scheduler/ConcurrentMergeSchedulerProvider.java | 0 .../index/merge/scheduler/MergeSchedulerModule.java | 0 .../index/merge/scheduler/MergeSchedulerProvider.java | 0 .../index/merge/scheduler/SerialMergeSchedulerProvider.java | 0 .../index/percolator/PercolateIndexUnavailable.java | 0 .../elasticsearch/index/percolator/PercolatorException.java | 0 .../elasticsearch/index/percolator/PercolatorExecutor.java | 0 .../org/elasticsearch/index/percolator/PercolatorModule.java | 0 .../org/elasticsearch/index/percolator/PercolatorService.java | 0 .../java/org/elasticsearch/index/query/AndFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/AndFilterParser.java | 0 .../java/org/elasticsearch/index/query/BaseFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/BaseQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/BoolFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/BoolFilterParser.java | 0 .../java/org/elasticsearch/index/query/BoolQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/BoolQueryParser.java | 0 .../org/elasticsearch/index/query/BoostingQueryBuilder.java | 0 .../org/elasticsearch/index/query/BoostingQueryParser.java | 0 .../elasticsearch/index/query/ConstantScoreQueryBuilder.java | 0 .../elasticsearch/index/query/ConstantScoreQueryParser.java | 0 .../index/query/CustomBoostFactorQueryBuilder.java | 0 .../index/query/CustomBoostFactorQueryParser.java | 0 .../index/query/CustomFiltersScoreQueryBuilder.java | 0 .../index/query/CustomFiltersScoreQueryParser.java | 0 .../elasticsearch/index/query/CustomScoreQueryBuilder.java | 0 .../org/elasticsearch/index/query/CustomScoreQueryParser.java | 0 .../org/elasticsearch/index/query/DisMaxQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/DisMaxQueryParser.java | 0 .../org/elasticsearch/index/query/ExistsFilterBuilder.java | 0 .../org/elasticsearch/index/query/ExistsFilterParser.java | 0 .../org/elasticsearch/index/query/FQueryFilterParser.java | 0 .../index/query/FieldMaskingSpanQueryBuilder.java | 0 .../index/query/FieldMaskingSpanQueryParser.java | 0 .../java/org/elasticsearch/index/query/FieldQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/FieldQueryParser.java | 0 .../java/org/elasticsearch/index/query/FilterBuilder.java | 0 .../java/org/elasticsearch/index/query/FilterBuilders.java | 0 .../main/java/org/elasticsearch/index/query/FilterParser.java | 0 .../org/elasticsearch/index/query/FilterParserFactory.java | 0 .../org/elasticsearch/index/query/FilteredQueryBuilder.java | 0 .../org/elasticsearch/index/query/FilteredQueryParser.java | 0 .../index/query/FuzzyLikeThisFieldQueryBuilder.java | 0 .../index/query/FuzzyLikeThisFieldQueryParser.java | 0 .../elasticsearch/index/query/FuzzyLikeThisQueryBuilder.java | 0 .../elasticsearch/index/query/FuzzyLikeThisQueryParser.java | 0 .../java/org/elasticsearch/index/query/FuzzyQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/FuzzyQueryParser.java | 0 .../index/query/GeoBoundingBoxFilterBuilder.java | 0 .../elasticsearch/index/query/GeoBoundingBoxFilterParser.java | 0 .../elasticsearch/index/query/GeoDistanceFilterBuilder.java | 0 .../elasticsearch/index/query/GeoDistanceFilterParser.java | 0 .../index/query/GeoDistanceRangeFilterBuilder.java | 0 .../index/query/GeoDistanceRangeFilterParser.java | 0 .../elasticsearch/index/query/GeoPolygonFilterBuilder.java | 0 .../org/elasticsearch/index/query/GeoPolygonFilterParser.java | 0 .../org/elasticsearch/index/query/HasChildFilterBuilder.java | 0 .../org/elasticsearch/index/query/HasChildFilterParser.java | 0 .../org/elasticsearch/index/query/HasChildQueryBuilder.java | 0 .../org/elasticsearch/index/query/HasChildQueryParser.java | 0 .../java/org/elasticsearch/index/query/IdsFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/IdsFilterParser.java | 0 .../java/org/elasticsearch/index/query/IdsQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/IdsQueryParser.java | 0 .../org/elasticsearch/index/query/IndexQueryParserModule.java | 0 .../elasticsearch/index/query/IndexQueryParserService.java | 0 .../org/elasticsearch/index/query/IndicesQueryBuilder.java | 0 .../org/elasticsearch/index/query/IndicesQueryParser.java | 0 .../org/elasticsearch/index/query/LimitFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/LimitFilterParser.java | 0 .../org/elasticsearch/index/query/MatchAllFilterBuilder.java | 0 .../org/elasticsearch/index/query/MatchAllFilterParser.java | 0 .../org/elasticsearch/index/query/MatchAllQueryBuilder.java | 0 .../org/elasticsearch/index/query/MatchAllQueryParser.java | 0 .../org/elasticsearch/index/query/MissingFilterBuilder.java | 0 .../org/elasticsearch/index/query/MissingFilterParser.java | 0 .../index/query/MoreLikeThisFieldQueryBuilder.java | 0 .../index/query/MoreLikeThisFieldQueryParser.java | 0 .../elasticsearch/index/query/MoreLikeThisQueryBuilder.java | 0 .../elasticsearch/index/query/MoreLikeThisQueryParser.java | 0 .../org/elasticsearch/index/query/NestedFilterBuilder.java | 0 .../org/elasticsearch/index/query/NestedFilterParser.java | 0 .../org/elasticsearch/index/query/NestedQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/NestedQueryParser.java | 0 .../java/org/elasticsearch/index/query/NotFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/NotFilterParser.java | 0 .../elasticsearch/index/query/NumericRangeFilterBuilder.java | 0 .../elasticsearch/index/query/NumericRangeFilterParser.java | 0 .../java/org/elasticsearch/index/query/OrFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/OrFilterParser.java | 0 .../main/java/org/elasticsearch/index/query/ParsedQuery.java | 0 .../org/elasticsearch/index/query/PrefixFilterBuilder.java | 0 .../org/elasticsearch/index/query/PrefixFilterParser.java | 0 .../org/elasticsearch/index/query/PrefixQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/PrefixQueryParser.java | 0 .../main/java/org/elasticsearch/index/query/QueryBuilder.java | 0 .../org/elasticsearch/index/query/QueryBuilderException.java | 0 .../java/org/elasticsearch/index/query/QueryBuilders.java | 0 .../org/elasticsearch/index/query/QueryFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/QueryFilterParser.java | 0 .../java/org/elasticsearch/index/query/QueryParseContext.java | 0 .../main/java/org/elasticsearch/index/query/QueryParser.java | 0 .../org/elasticsearch/index/query/QueryParserFactory.java | 0 .../org/elasticsearch/index/query/QueryParsingException.java | 0 .../elasticsearch/index/query/QueryStringQueryBuilder.java | 0 .../org/elasticsearch/index/query/QueryStringQueryParser.java | 0 .../org/elasticsearch/index/query/RangeFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/RangeFilterParser.java | 0 .../java/org/elasticsearch/index/query/RangeQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/RangeQueryParser.java | 0 .../org/elasticsearch/index/query/ScriptFilterBuilder.java | 0 .../org/elasticsearch/index/query/ScriptFilterParser.java | 0 .../org/elasticsearch/index/query/SpanFirstQueryBuilder.java | 0 .../org/elasticsearch/index/query/SpanFirstQueryParser.java | 0 .../org/elasticsearch/index/query/SpanNearQueryBuilder.java | 0 .../org/elasticsearch/index/query/SpanNearQueryParser.java | 0 .../org/elasticsearch/index/query/SpanNotQueryBuilder.java | 0 .../org/elasticsearch/index/query/SpanNotQueryParser.java | 0 .../org/elasticsearch/index/query/SpanOrQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/SpanOrQueryParser.java | 0 .../java/org/elasticsearch/index/query/SpanQueryBuilder.java | 0 .../org/elasticsearch/index/query/SpanTermQueryBuilder.java | 0 .../org/elasticsearch/index/query/SpanTermQueryParser.java | 0 .../java/org/elasticsearch/index/query/TermFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/TermFilterParser.java | 0 .../java/org/elasticsearch/index/query/TermQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/TermQueryParser.java | 0 .../org/elasticsearch/index/query/TermsFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/TermsFilterParser.java | 0 .../java/org/elasticsearch/index/query/TermsQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/TermsQueryParser.java | 0 .../java/org/elasticsearch/index/query/TextQueryBuilder.java | 0 .../java/org/elasticsearch/index/query/TextQueryParser.java | 0 .../elasticsearch/index/query/TopChildrenQueryBuilder.java | 0 .../org/elasticsearch/index/query/TopChildrenQueryParser.java | 0 .../java/org/elasticsearch/index/query/TypeFilterBuilder.java | 0 .../java/org/elasticsearch/index/query/TypeFilterParser.java | 0 .../org/elasticsearch/index/query/WildcardQueryBuilder.java | 0 .../org/elasticsearch/index/query/WildcardQueryParser.java | 0 .../org/elasticsearch/index/query/WrapperQueryBuilder.java | 0 .../org/elasticsearch/index/query/WrapperQueryParser.java | 0 .../org/elasticsearch/index/query/support/QueryParsers.java | 0 .../java/org/elasticsearch/index/refresh/RefreshStats.java | 0 .../index/search/NumericRangeFieldDataFilter.java | 0 .../java/org/elasticsearch/index/search/TextQueryParser.java | 0 .../main/java/org/elasticsearch/index/search/UidFilter.java | 0 .../org/elasticsearch/index/search/child/ChildCollector.java | 0 .../org/elasticsearch/index/search/child/HasChildFilter.java | 0 .../elasticsearch/index/search/child/TopChildrenQuery.java | 0 .../java/org/elasticsearch/index/search/geo/GeoDistance.java | 0 .../index/search/geo/GeoDistanceDataComparator.java | 0 .../org/elasticsearch/index/search/geo/GeoDistanceFilter.java | 0 .../index/search/geo/GeoDistanceRangeFilter.java | 0 .../java/org/elasticsearch/index/search/geo/GeoHashUtils.java | 0 .../org/elasticsearch/index/search/geo/GeoPolygonFilter.java | 0 .../java/org/elasticsearch/index/search/geo/GeoUtils.java | 0 .../index/search/geo/InMemoryGeoBoundingBoxFilter.java | 0 .../index/search/geo/IndexedGeoBoundingBoxFilter.java | 0 .../main/java/org/elasticsearch/index/search/geo/Point.java | 0 .../org/elasticsearch/index/search/nested/BlockJoinQuery.java | 0 .../index/search/nested/NestedChildrenCollector.java | 0 .../elasticsearch/index/search/nested/NestedDocsFilter.java | 0 .../index/search/nested/NonNestedDocsFilter.java | 0 .../index/search/slowlog/ShardSlowLogSearchService.java | 0 .../org/elasticsearch/index/search/stats/SearchStats.java | 0 .../elasticsearch/index/search/stats/ShardSearchModule.java | 0 .../elasticsearch/index/search/stats/ShardSearchService.java | 0 .../index/search/stats/StatsGroupsParseElement.java | 0 .../java/org/elasticsearch/index/service/IndexService.java | 0 .../org/elasticsearch/index/service/InternalIndexService.java | 0 .../java/org/elasticsearch/index/settings/IndexSettings.java | 0 .../org/elasticsearch/index/settings/IndexSettingsModule.java | 0 .../elasticsearch/index/settings/IndexSettingsProvider.java | 0 .../elasticsearch/index/settings/IndexSettingsService.java | 0 .../index/shard/AbstractIndexShardComponent.java | 0 .../main/java/org/elasticsearch/index/shard/DocsStats.java | 0 .../index/shard/IllegalIndexShardStateException.java | 0 .../elasticsearch/index/shard/IndexShardClosedException.java | 0 .../org/elasticsearch/index/shard/IndexShardComponent.java | 0 .../index/shard/IndexShardCreationException.java | 0 .../org/elasticsearch/index/shard/IndexShardException.java | 0 .../org/elasticsearch/index/shard/IndexShardManagement.java | 0 .../java/org/elasticsearch/index/shard/IndexShardModule.java | 0 .../index/shard/IndexShardNotRecoveringException.java | 0 .../index/shard/IndexShardNotStartedException.java | 0 .../index/shard/IndexShardRecoveringException.java | 0 .../index/shard/IndexShardRelocatedException.java | 0 .../elasticsearch/index/shard/IndexShardStartedException.java | 0 .../java/org/elasticsearch/index/shard/IndexShardState.java | 0 .../main/java/org/elasticsearch/index/shard/ShardId.java | 0 .../org/elasticsearch/index/shard/service/IndexShard.java | 0 .../elasticsearch/index/shard/service/InternalIndexShard.java | 0 .../index/similarity/AbstractSimilarityProvider.java | 0 .../index/similarity/DefaultSimilarityProvider.java | 0 .../org/elasticsearch/index/similarity/SimilarityModule.java | 0 .../elasticsearch/index/similarity/SimilarityProvider.java | 0 .../index/similarity/SimilarityProviderFactory.java | 0 .../org/elasticsearch/index/similarity/SimilarityService.java | 0 .../java/org/elasticsearch/index/store/DirectoryService.java | 0 .../main/java/org/elasticsearch/index/store/IndexStore.java | 0 .../java/org/elasticsearch/index/store/IndexStoreModule.java | 0 .../main/java/org/elasticsearch/index/store/Store.java | 0 .../java/org/elasticsearch/index/store/StoreException.java | 0 .../java/org/elasticsearch/index/store/StoreFileMetaData.java | 0 .../java/org/elasticsearch/index/store/StoreManagement.java | 0 .../main/java/org/elasticsearch/index/store/StoreModule.java | 0 .../main/java/org/elasticsearch/index/store/StoreStats.java | 0 .../org/elasticsearch/index/store/fs/FsDirectoryService.java | 0 .../java/org/elasticsearch/index/store/fs/FsIndexStore.java | 0 .../elasticsearch/index/store/fs/MmapFsDirectoryService.java | 0 .../org/elasticsearch/index/store/fs/MmapFsIndexStore.java | 0 .../elasticsearch/index/store/fs/MmapFsIndexStoreModule.java | 0 .../elasticsearch/index/store/fs/NioFsDirectoryService.java | 0 .../org/elasticsearch/index/store/fs/NioFsIndexStore.java | 0 .../elasticsearch/index/store/fs/NioFsIndexStoreModule.java | 0 .../index/store/fs/SimpleFsDirectoryService.java | 0 .../org/elasticsearch/index/store/fs/SimpleFsIndexStore.java | 0 .../index/store/fs/SimpleFsIndexStoreModule.java | 0 .../index/store/memory/ByteBufferDirectoryService.java | 0 .../index/store/memory/ByteBufferIndexStore.java | 0 .../index/store/memory/MemoryIndexStoreModule.java | 0 .../elasticsearch/index/store/ram/RamDirectoryService.java | 0 .../java/org/elasticsearch/index/store/ram/RamIndexStore.java | 0 .../elasticsearch/index/store/ram/RamIndexStoreModule.java | 0 .../elasticsearch/index/store/support/AbstractIndexStore.java | 0 .../elasticsearch/index/store/support/ForceSyncDirectory.java | 0 .../main/java/org/elasticsearch/index/translog/Translog.java | 0 .../org/elasticsearch/index/translog/TranslogException.java | 0 .../java/org/elasticsearch/index/translog/TranslogModule.java | 0 .../org/elasticsearch/index/translog/TranslogService.java | 0 .../org/elasticsearch/index/translog/TranslogStreams.java | 0 .../elasticsearch/index/translog/fs/FsChannelSnapshot.java | 0 .../java/org/elasticsearch/index/translog/fs/FsTranslog.java | 0 .../org/elasticsearch/index/translog/fs/FsTranslogFile.java | 0 .../org/elasticsearch/index/translog/fs/RafReference.java | 0 .../elasticsearch/indices/AliasFilterParsingException.java | 0 .../elasticsearch/indices/IndexAlreadyExistsException.java | 0 .../org/elasticsearch/indices/IndexCreationException.java | 0 .../java/org/elasticsearch/indices/IndexMissingException.java | 0 .../indices/IndexTemplateAlreadyExistsException.java | 0 .../elasticsearch/indices/IndexTemplateMissingException.java | 0 .../main/java/org/elasticsearch/indices/IndicesLifecycle.java | 0 .../main/java/org/elasticsearch/indices/IndicesModule.java | 0 .../main/java/org/elasticsearch/indices/IndicesService.java | 0 .../org/elasticsearch/indices/InternalIndicesLifecycle.java | 0 .../org/elasticsearch/indices/InternalIndicesService.java | 0 .../org/elasticsearch/indices/InvalidAliasNameException.java | 0 .../org/elasticsearch/indices/InvalidIndexNameException.java | 0 .../elasticsearch/indices/InvalidIndexTemplateException.java | 0 .../org/elasticsearch/indices/InvalidTypeNameException.java | 0 .../main/java/org/elasticsearch/indices/NodeIndicesStats.java | 0 .../java/org/elasticsearch/indices/TypeMissingException.java | 0 .../elasticsearch/indices/analysis/IndicesAnalysisModule.java | 0 .../indices/analysis/IndicesAnalysisService.java | 0 .../indices/cache/filter/IndicesNodeFilterCache.java | 0 .../indices/cluster/IndicesClusterStateService.java | 0 .../indices/memory/IndexingMemoryBufferController.java | 0 .../org/elasticsearch/indices/query/IndicesQueriesModule.java | 0 .../elasticsearch/indices/query/IndicesQueriesRegistry.java | 0 .../indices/recovery/IgnoreRecoveryException.java | 0 .../indices/recovery/RecoverFilesRecoveryException.java | 0 .../indices/recovery/RecoveryCleanFilesRequest.java | 0 .../indices/recovery/RecoveryFailedException.java | 0 .../indices/recovery/RecoveryFileChunkRequest.java | 0 .../indices/recovery/RecoveryFilesInfoRequest.java | 0 .../indices/recovery/RecoveryFinalizeRecoveryRequest.java | 0 .../recovery/RecoveryPrepareForTranslogOperationsRequest.java | 0 .../org/elasticsearch/indices/recovery/RecoveryResponse.java | 0 .../org/elasticsearch/indices/recovery/RecoverySettings.java | 0 .../org/elasticsearch/indices/recovery/RecoverySource.java | 0 .../org/elasticsearch/indices/recovery/RecoveryStatus.java | 0 .../org/elasticsearch/indices/recovery/RecoveryTarget.java | 0 .../indices/recovery/RecoveryTranslogOperationsRequest.java | 0 .../elasticsearch/indices/recovery/StartRecoveryRequest.java | 0 .../java/org/elasticsearch/indices/store/IndicesStore.java | 0 .../indices/store/TransportNodesListShardStoreMetaData.java | 0 .../java/org/elasticsearch/indices/ttl/IndicesTTLService.java | 0 .../main/java/org/elasticsearch/jmx/JmxClusterService.java | 0 .../org/elasticsearch/jmx/JmxConnectorCreationException.java | 0 .../main/java/org/elasticsearch/jmx/JmxException.java | 0 .../main/java/org/elasticsearch/jmx/JmxModule.java | 0 .../java/org/elasticsearch/jmx/JmxRegistrationException.java | 0 .../main/java/org/elasticsearch/jmx/JmxService.java | 0 .../src => src}/main/java/org/elasticsearch/jmx/MBean.java | 0 .../main/java/org/elasticsearch/jmx/ManagedAttribute.java | 0 .../main/java/org/elasticsearch/jmx/ManagedGroupName.java | 0 .../main/java/org/elasticsearch/jmx/ManagedOperation.java | 0 .../main/java/org/elasticsearch/jmx/ResourceDMBean.java | 0 .../org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java | 0 .../main/java/org/elasticsearch/monitor/MonitorModule.java | 0 .../main/java/org/elasticsearch/monitor/MonitorService.java | 0 .../java/org/elasticsearch/monitor/dump/AbstractDump.java | 0 .../main/java/org/elasticsearch/monitor/dump/Dump.java | 0 .../monitor/dump/DumpContributionFailedException.java | 0 .../java/org/elasticsearch/monitor/dump/DumpContributor.java | 0 .../elasticsearch/monitor/dump/DumpContributorFactory.java | 0 .../java/org/elasticsearch/monitor/dump/DumpException.java | 0 .../monitor/dump/DumpGenerationFailedException.java | 0 .../java/org/elasticsearch/monitor/dump/DumpGenerator.java | 0 .../org/elasticsearch/monitor/dump/DumpMonitorService.java | 0 .../main/java/org/elasticsearch/monitor/dump/SimpleDump.java | 0 .../org/elasticsearch/monitor/dump/SimpleDumpGenerator.java | 0 .../monitor/dump/cluster/ClusterDumpContributor.java | 0 .../elasticsearch/monitor/dump/heap/HeapDumpContributor.java | 0 .../monitor/dump/summary/SummaryDumpContributor.java | 0 .../monitor/dump/thread/ThreadDumpContributor.java | 0 .../java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java | 0 .../main/java/org/elasticsearch/monitor/jvm/JvmInfo.java | 0 .../java/org/elasticsearch/monitor/jvm/JvmMonitorService.java | 0 .../main/java/org/elasticsearch/monitor/jvm/JvmService.java | 0 .../main/java/org/elasticsearch/monitor/jvm/JvmStats.java | 0 .../org/elasticsearch/monitor/network/JmxNetworkProbe.java | 0 .../java/org/elasticsearch/monitor/network/NetworkInfo.java | 0 .../java/org/elasticsearch/monitor/network/NetworkProbe.java | 0 .../org/elasticsearch/monitor/network/NetworkService.java | 0 .../java/org/elasticsearch/monitor/network/NetworkStats.java | 0 .../org/elasticsearch/monitor/network/SigarNetworkProbe.java | 0 .../main/java/org/elasticsearch/monitor/os/JmxOsProbe.java | 0 .../main/java/org/elasticsearch/monitor/os/OsInfo.java | 0 .../main/java/org/elasticsearch/monitor/os/OsProbe.java | 0 .../main/java/org/elasticsearch/monitor/os/OsService.java | 0 .../main/java/org/elasticsearch/monitor/os/OsStats.java | 0 .../main/java/org/elasticsearch/monitor/os/SigarOsProbe.java | 0 .../org/elasticsearch/monitor/process/JmxProcessProbe.java | 0 .../java/org/elasticsearch/monitor/process/ProcessInfo.java | 0 .../java/org/elasticsearch/monitor/process/ProcessProbe.java | 0 .../org/elasticsearch/monitor/process/ProcessService.java | 0 .../java/org/elasticsearch/monitor/process/ProcessStats.java | 0 .../org/elasticsearch/monitor/process/SigarProcessProbe.java | 0 .../java/org/elasticsearch/monitor/sigar/SigarService.java | 0 .../src => src}/main/java/org/elasticsearch/node/Node.java | 0 .../main/java/org/elasticsearch/node/NodeBuilder.java | 0 .../main/java/org/elasticsearch/node/NodeClosedException.java | 0 .../java/org/elasticsearch/node/internal/InternalNode.java | 0 .../elasticsearch/node/internal/InternalSettingsPerparer.java | 0 .../main/java/org/elasticsearch/node/internal/NodeModule.java | 0 .../main/java/org/elasticsearch/node/package-info.java | 0 .../main/java/org/elasticsearch/node/service/NodeService.java | 0 .../org/elasticsearch/node/settings/NodeSettingsService.java | 0 .../main/java/org/elasticsearch/plugins/AbstractPlugin.java | 0 .../java/org/elasticsearch/plugins/IndexPluginsModule.java | 0 .../main/java/org/elasticsearch/plugins/Plugin.java | 0 .../main/java/org/elasticsearch/plugins/PluginManager.java | 0 .../main/java/org/elasticsearch/plugins/PluginsModule.java | 0 .../main/java/org/elasticsearch/plugins/PluginsService.java | 0 .../java/org/elasticsearch/plugins/ShardsPluginsModule.java | 0 .../java/org/elasticsearch/rest/AbstractRestResponse.java | 0 .../main/java/org/elasticsearch/rest/BaseRestHandler.java | 0 .../main/java/org/elasticsearch/rest/BytesRestResponse.java | 0 .../main/java/org/elasticsearch/rest/RestChannel.java | 0 .../main/java/org/elasticsearch/rest/RestController.java | 0 .../main/java/org/elasticsearch/rest/RestHandler.java | 0 .../main/java/org/elasticsearch/rest/RestModule.java | 0 .../main/java/org/elasticsearch/rest/RestRequest.java | 0 .../main/java/org/elasticsearch/rest/RestResponse.java | 0 .../main/java/org/elasticsearch/rest/RestStatus.java | 0 .../main/java/org/elasticsearch/rest/StringRestResponse.java | 0 .../main/java/org/elasticsearch/rest/Utf8RestResponse.java | 0 .../java/org/elasticsearch/rest/XContentRestResponse.java | 0 .../org/elasticsearch/rest/XContentThrowableRestResponse.java | 0 .../java/org/elasticsearch/rest/action/RestActionModule.java | 0 .../action/admin/cluster/health/RestClusterHealthAction.java | 0 .../action/admin/cluster/node/info/RestNodesInfoAction.java | 0 .../admin/cluster/node/restart/RestNodesRestartAction.java | 0 .../admin/cluster/node/shutdown/RestNodesShutdownAction.java | 0 .../action/admin/cluster/node/stats/RestNodesStatsAction.java | 0 .../admin/cluster/ping/broadcast/RestBroadcastPingAction.java | 0 .../cluster/ping/replication/RestReplicationPingAction.java | 0 .../admin/cluster/ping/single/RestSinglePingAction.java | 0 .../admin/cluster/reroute/RestClusterRerouteAction.java | 0 .../admin/cluster/settings/RestClusterGetSettingsAction.java | 0 .../cluster/settings/RestClusterUpdateSettingsAction.java | 0 .../action/admin/cluster/state/RestClusterStateAction.java | 0 .../admin/indices/alias/RestGetIndicesAliasesAction.java | 0 .../action/admin/indices/alias/RestIndicesAliasesAction.java | 0 .../rest/action/admin/indices/analyze/RestAnalyzeAction.java | 0 .../indices/cache/clear/RestClearIndicesCacheAction.java | 0 .../rest/action/admin/indices/close/RestCloseIndexAction.java | 0 .../action/admin/indices/create/RestCreateIndexAction.java | 0 .../action/admin/indices/delete/RestDeleteIndexAction.java | 0 .../action/admin/indices/exists/RestIndicesExistsAction.java | 0 .../rest/action/admin/indices/flush/RestFlushAction.java | 0 .../indices/gateway/snapshot/RestGatewaySnapshotAction.java | 0 .../admin/indices/mapping/delete/RestDeleteMappingAction.java | 0 .../admin/indices/mapping/get/RestGetMappingAction.java | 0 .../admin/indices/mapping/put/RestPutMappingAction.java | 0 .../rest/action/admin/indices/open/RestOpenIndexAction.java | 0 .../action/admin/indices/optimize/RestOptimizeAction.java | 0 .../rest/action/admin/indices/refresh/RestRefreshAction.java | 0 .../admin/indices/segments/RestIndicesSegmentsAction.java | 0 .../action/admin/indices/settings/RestGetSettingsAction.java | 0 .../admin/indices/settings/RestUpdateSettingsAction.java | 0 .../action/admin/indices/stats/RestIndicesStatsAction.java | 0 .../action/admin/indices/status/RestIndicesStatusAction.java | 0 .../template/delete/RestDeleteIndexTemplateAction.java | 0 .../indices/template/get/RestGetIndexTemplateAction.java | 0 .../indices/template/put/RestPutIndexTemplateAction.java | 0 .../org/elasticsearch/rest/action/bulk/RestBulkAction.java | 0 .../org/elasticsearch/rest/action/count/RestCountAction.java | 0 .../elasticsearch/rest/action/delete/RestDeleteAction.java | 0 .../rest/action/deletebyquery/RestDeleteByQueryAction.java | 0 .../java/org/elasticsearch/rest/action/get/RestGetAction.java | 0 .../org/elasticsearch/rest/action/get/RestMultiGetAction.java | 0 .../org/elasticsearch/rest/action/index/RestIndexAction.java | 0 .../org/elasticsearch/rest/action/main/RestMainAction.java | 0 .../main/java/org/elasticsearch/rest/action/main/quotes.json | 0 .../elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java | 0 .../rest/action/percolate/RestPercolateAction.java | 0 .../elasticsearch/rest/action/search/RestSearchAction.java | 0 .../rest/action/search/RestSearchScrollAction.java | 0 .../org/elasticsearch/rest/action/support/RestActions.java | 0 .../rest/action/support/RestXContentBuilder.java | 0 .../org/elasticsearch/rest/support/AbstractRestRequest.java | 0 .../main/java/org/elasticsearch/rest/support/RestUtils.java | 0 .../java/org/elasticsearch/river/AbstractRiverComponent.java | 0 .../src => src}/main/java/org/elasticsearch/river/River.java | 0 .../main/java/org/elasticsearch/river/RiverComponent.java | 0 .../main/java/org/elasticsearch/river/RiverException.java | 0 .../main/java/org/elasticsearch/river/RiverIndexName.java | 0 .../main/java/org/elasticsearch/river/RiverModule.java | 0 .../main/java/org/elasticsearch/river/RiverName.java | 0 .../main/java/org/elasticsearch/river/RiverNameModule.java | 0 .../main/java/org/elasticsearch/river/RiverSettings.java | 0 .../main/java/org/elasticsearch/river/RiversManager.java | 0 .../main/java/org/elasticsearch/river/RiversModule.java | 0 .../java/org/elasticsearch/river/RiversPluginsModule.java | 0 .../main/java/org/elasticsearch/river/RiversService.java | 0 .../java/org/elasticsearch/river/RiversTypesRegistry.java | 0 .../river/cluster/PublishRiverClusterStateAction.java | 0 .../elasticsearch/river/cluster/RiverClusterChangedEvent.java | 0 .../org/elasticsearch/river/cluster/RiverClusterService.java | 0 .../org/elasticsearch/river/cluster/RiverClusterState.java | 0 .../river/cluster/RiverClusterStateListener.java | 0 .../river/cluster/RiverClusterStateUpdateTask.java | 0 .../java/org/elasticsearch/river/cluster/RiverNodeHelper.java | 0 .../main/java/org/elasticsearch/river/dummy/DummyRiver.java | 0 .../java/org/elasticsearch/river/dummy/DummyRiverModule.java | 0 .../java/org/elasticsearch/river/routing/RiverRouting.java | 0 .../java/org/elasticsearch/river/routing/RiversRouter.java | 0 .../java/org/elasticsearch/river/routing/RiversRouting.java | 0 .../org/elasticsearch/script/AbstractDoubleSearchScript.java | 0 .../org/elasticsearch/script/AbstractExecutableScript.java | 0 .../org/elasticsearch/script/AbstractFloatSearchScript.java | 0 .../org/elasticsearch/script/AbstractLongSearchScript.java | 0 .../java/org/elasticsearch/script/AbstractSearchScript.java | 0 .../main/java/org/elasticsearch/script/CompiledScript.java | 0 .../main/java/org/elasticsearch/script/ExecutableScript.java | 0 .../org/elasticsearch/script/NativeScriptEngineService.java | 0 .../java/org/elasticsearch/script/NativeScriptFactory.java | 0 .../java/org/elasticsearch/script/ScriptEngineService.java | 0 .../main/java/org/elasticsearch/script/ScriptException.java | 0 .../main/java/org/elasticsearch/script/ScriptModule.java | 0 .../main/java/org/elasticsearch/script/ScriptService.java | 0 .../main/java/org/elasticsearch/script/SearchScript.java | 0 .../elasticsearch/script/mvel/MvelScriptEngineService.java | 0 .../main/java/org/elasticsearch/search/Scroll.java | 0 .../java/org/elasticsearch/search/SearchContextException.java | 0 .../elasticsearch/search/SearchContextMissingException.java | 0 .../main/java/org/elasticsearch/search/SearchException.java | 0 .../main/java/org/elasticsearch/search/SearchHit.java | 0 .../main/java/org/elasticsearch/search/SearchHitField.java | 0 .../main/java/org/elasticsearch/search/SearchHits.java | 0 .../main/java/org/elasticsearch/search/SearchModule.java | 0 .../java/org/elasticsearch/search/SearchParseElement.java | 0 .../java/org/elasticsearch/search/SearchParseException.java | 0 .../main/java/org/elasticsearch/search/SearchPhase.java | 0 .../main/java/org/elasticsearch/search/SearchPhaseResult.java | 0 .../main/java/org/elasticsearch/search/SearchService.java | 0 .../main/java/org/elasticsearch/search/SearchShardTarget.java | 0 .../java/org/elasticsearch/search/TransportSearchModule.java | 0 .../elasticsearch/search/action/SearchServiceListener.java | 0 .../search/action/SearchServiceTransportAction.java | 0 .../org/elasticsearch/search/builder/SearchSourceBuilder.java | 0 .../search/builder/SearchSourceBuilderException.java | 0 .../org/elasticsearch/search/controller/ScoreDocQueue.java | 0 .../search/controller/SearchPhaseController.java | 0 .../java/org/elasticsearch/search/controller/ShardDoc.java | 0 .../org/elasticsearch/search/controller/ShardFieldDoc.java | 0 .../org/elasticsearch/search/controller/ShardScoreDoc.java | 0 .../org/elasticsearch/search/count/CountSearchResult.java | 0 .../main/java/org/elasticsearch/search/dfs/AggregatedDfs.java | 0 .../java/org/elasticsearch/search/dfs/CachedDfSource.java | 0 .../main/java/org/elasticsearch/search/dfs/DfsPhase.java | 0 .../elasticsearch/search/dfs/DfsPhaseExecutionException.java | 0 .../java/org/elasticsearch/search/dfs/DfsSearchResult.java | 0 .../org/elasticsearch/search/facet/AbstractFacetBuilder.java | 0 .../elasticsearch/search/facet/AbstractFacetCollector.java | 0 .../main/java/org/elasticsearch/search/facet/Facet.java | 0 .../elasticsearch/search/facet/FacetBinaryParseElement.java | 0 .../java/org/elasticsearch/search/facet/FacetBuilders.java | 0 .../java/org/elasticsearch/search/facet/FacetCollector.java | 0 .../main/java/org/elasticsearch/search/facet/FacetModule.java | 0 .../org/elasticsearch/search/facet/FacetParseElement.java | 0 .../main/java/org/elasticsearch/search/facet/FacetPhase.java | 0 .../search/facet/FacetPhaseExecutionException.java | 0 .../java/org/elasticsearch/search/facet/FacetProcessor.java | 0 .../java/org/elasticsearch/search/facet/FacetProcessors.java | 0 .../main/java/org/elasticsearch/search/facet/Facets.java | 0 .../java/org/elasticsearch/search/facet/InternalFacet.java | 0 .../java/org/elasticsearch/search/facet/InternalFacets.java | 0 .../search/facet/OptimizeGlobalFacetCollector.java | 0 .../org/elasticsearch/search/facet/SearchContextFacets.java | 0 .../org/elasticsearch/search/facet/TransportFacetModule.java | 0 .../facet/datehistogram/CountDateHistogramFacetCollector.java | 0 .../search/facet/datehistogram/DateHistogramFacet.java | 0 .../search/facet/datehistogram/DateHistogramFacetBuilder.java | 0 .../facet/datehistogram/DateHistogramFacetProcessor.java | 0 .../facet/datehistogram/InternalCountDateHistogramFacet.java | 0 .../facet/datehistogram/InternalDateHistogramFacet.java | 0 .../facet/datehistogram/InternalFullDateHistogramFacet.java | 0 .../facet/datehistogram/ValueDateHistogramFacetCollector.java | 0 .../datehistogram/ValueScriptDateHistogramFacetCollector.java | 0 .../org/elasticsearch/search/facet/filter/FilterFacet.java | 0 .../elasticsearch/search/facet/filter/FilterFacetBuilder.java | 0 .../search/facet/filter/FilterFacetCollector.java | 0 .../search/facet/filter/FilterFacetProcessor.java | 0 .../search/facet/filter/InternalFilterFacet.java | 0 .../search/facet/geodistance/GeoDistanceFacet.java | 0 .../search/facet/geodistance/GeoDistanceFacetBuilder.java | 0 .../search/facet/geodistance/GeoDistanceFacetCollector.java | 0 .../search/facet/geodistance/GeoDistanceFacetProcessor.java | 0 .../search/facet/geodistance/InternalGeoDistanceFacet.java | 0 .../facet/geodistance/ScriptGeoDistanceFacetCollector.java | 0 .../facet/geodistance/ValueGeoDistanceFacetCollector.java | 0 .../elasticsearch/search/facet/histogram/HistogramFacet.java | 0 .../search/facet/histogram/HistogramFacetBuilder.java | 0 .../search/facet/histogram/HistogramFacetProcessor.java | 0 .../search/facet/histogram/HistogramScriptFacetBuilder.java | 0 .../search/facet/histogram/InternalHistogramFacet.java | 0 .../bounded/BoundedCountHistogramFacetCollector.java | 0 .../bounded/BoundedValueHistogramFacetCollector.java | 0 .../bounded/BoundedValueScriptHistogramFacetCollector.java | 0 .../histogram/bounded/InternalBoundedCountHistogramFacet.java | 0 .../histogram/bounded/InternalBoundedFullHistogramFacet.java | 0 .../histogram/unbounded/CountHistogramFacetCollector.java | 0 .../histogram/unbounded/FullHistogramFacetCollector.java | 0 .../histogram/unbounded/InternalCountHistogramFacet.java | 0 .../facet/histogram/unbounded/InternalFullHistogramFacet.java | 0 .../histogram/unbounded/ScriptHistogramFacetCollector.java | 0 .../histogram/unbounded/ValueHistogramFacetCollector.java | 0 .../unbounded/ValueScriptHistogramFacetCollector.java | 0 .../elasticsearch/search/facet/query/InternalQueryFacet.java | 0 .../java/org/elasticsearch/search/facet/query/QueryFacet.java | 0 .../elasticsearch/search/facet/query/QueryFacetBuilder.java | 0 .../elasticsearch/search/facet/query/QueryFacetCollector.java | 0 .../elasticsearch/search/facet/query/QueryFacetProcessor.java | 0 .../elasticsearch/search/facet/range/InternalRangeFacet.java | 0 .../search/facet/range/KeyValueRangeFacetCollector.java | 0 .../java/org/elasticsearch/search/facet/range/RangeFacet.java | 0 .../elasticsearch/search/facet/range/RangeFacetBuilder.java | 0 .../elasticsearch/search/facet/range/RangeFacetCollector.java | 0 .../elasticsearch/search/facet/range/RangeFacetProcessor.java | 0 .../search/facet/range/RangeScriptFacetBuilder.java | 0 .../search/facet/range/ScriptRangeFacetCollector.java | 0 .../search/facet/statistical/InternalStatisticalFacet.java | 0 .../facet/statistical/ScriptStatisticalFacetCollector.java | 0 .../search/facet/statistical/StatisticalFacet.java | 0 .../search/facet/statistical/StatisticalFacetBuilder.java | 0 .../search/facet/statistical/StatisticalFacetCollector.java | 0 .../search/facet/statistical/StatisticalFacetProcessor.java | 0 .../facet/statistical/StatisticalFieldsFacetCollector.java | 0 .../facet/statistical/StatisticalScriptFacetBuilder.java | 0 .../elasticsearch/search/facet/terms/InternalTermsFacet.java | 0 .../java/org/elasticsearch/search/facet/terms/TermsFacet.java | 0 .../elasticsearch/search/facet/terms/TermsFacetBuilder.java | 0 .../elasticsearch/search/facet/terms/TermsFacetProcessor.java | 0 .../search/facet/terms/bytes/InternalByteTermsFacet.java | 0 .../search/facet/terms/bytes/TermsByteFacetCollector.java | 0 .../facet/terms/bytes/TermsByteOrdinalsFacetCollector.java | 0 .../search/facet/terms/doubles/InternalDoubleTermsFacet.java | 0 .../search/facet/terms/doubles/TermsDoubleFacetCollector.java | 0 .../terms/doubles/TermsDoubleOrdinalsFacetCollector.java | 0 .../search/facet/terms/floats/InternalFloatTermsFacet.java | 0 .../search/facet/terms/floats/TermsFloatFacetCollector.java | 0 .../facet/terms/floats/TermsFloatOrdinalsFacetCollector.java | 0 .../search/facet/terms/index/IndexNameFacetCollector.java | 0 .../search/facet/terms/ints/InternalIntTermsFacet.java | 0 .../search/facet/terms/ints/TermsIntFacetCollector.java | 0 .../facet/terms/ints/TermsIntOrdinalsFacetCollector.java | 0 .../search/facet/terms/ip/InternalIpTermsFacet.java | 0 .../search/facet/terms/ip/TermsIpFacetCollector.java | 0 .../search/facet/terms/ip/TermsIpOrdinalsFacetCollector.java | 0 .../search/facet/terms/longs/InternalLongTermsFacet.java | 0 .../search/facet/terms/longs/TermsLongFacetCollector.java | 0 .../facet/terms/longs/TermsLongOrdinalsFacetCollector.java | 0 .../search/facet/terms/shorts/InternalShortTermsFacet.java | 0 .../search/facet/terms/shorts/TermsShortFacetCollector.java | 0 .../facet/terms/shorts/TermsShortOrdinalsFacetCollector.java | 0 .../facet/terms/strings/FieldsTermsStringFacetCollector.java | 0 .../search/facet/terms/strings/InternalStringTermsFacet.java | 0 .../terms/strings/ScriptTermsStringFieldFacetCollector.java | 0 .../search/facet/terms/strings/TermsStringFacetCollector.java | 0 .../terms/strings/TermsStringOrdinalsFacetCollector.java | 0 .../search/facet/terms/support/EntryPriorityQueue.java | 0 .../search/facet/termsstats/InternalTermsStatsFacet.java | 0 .../search/facet/termsstats/TermsStatsFacet.java | 0 .../search/facet/termsstats/TermsStatsFacetBuilder.java | 0 .../search/facet/termsstats/TermsStatsFacetProcessor.java | 0 .../termsstats/doubles/InternalTermsStatsDoubleFacet.java | 0 .../termsstats/doubles/TermsStatsDoubleFacetCollector.java | 0 .../facet/termsstats/longs/InternalTermsStatsLongFacet.java | 0 .../facet/termsstats/longs/TermsStatsLongFacetCollector.java | 0 .../termsstats/strings/InternalTermsStatsStringFacet.java | 0 .../termsstats/strings/TermsStatsStringFacetCollector.java | 0 .../main/java/org/elasticsearch/search/fetch/FetchPhase.java | 0 .../search/fetch/FetchPhaseExecutionException.java | 0 .../org/elasticsearch/search/fetch/FetchSearchRequest.java | 0 .../org/elasticsearch/search/fetch/FetchSearchResult.java | 0 .../elasticsearch/search/fetch/FetchSearchResultProvider.java | 0 .../java/org/elasticsearch/search/fetch/FetchSubPhase.java | 0 .../org/elasticsearch/search/fetch/FieldsParseElement.java | 0 .../elasticsearch/search/fetch/QueryFetchSearchResult.java | 0 .../search/fetch/ScrollQueryFetchSearchResult.java | 0 .../search/fetch/explain/ExplainFetchSubPhase.java | 0 .../search/fetch/explain/ExplainParseElement.java | 0 .../fetch/matchedfilters/MatchedFiltersFetchSubPhase.java | 0 .../search/fetch/script/ScriptFieldsContext.java | 0 .../search/fetch/script/ScriptFieldsFetchSubPhase.java | 0 .../search/fetch/script/ScriptFieldsParseElement.java | 0 .../search/fetch/version/VersionFetchSubPhase.java | 0 .../search/fetch/version/VersionParseElement.java | 0 .../org/elasticsearch/search/highlight/HighlightBuilder.java | 0 .../org/elasticsearch/search/highlight/HighlightField.java | 0 .../org/elasticsearch/search/highlight/HighlightPhase.java | 0 .../search/highlight/HighlighterParseElement.java | 0 .../search/highlight/SearchContextHighlight.java | 0 .../vectorhighlight/SourceScoreOrderFragmentsBuilder.java | 0 .../vectorhighlight/SourceSimpleFragmentsBuilder.java | 0 .../elasticsearch/search/internal/ContextIndexSearcher.java | 0 .../search/internal/InternalScrollSearchRequest.java | 0 .../org/elasticsearch/search/internal/InternalSearchHit.java | 0 .../elasticsearch/search/internal/InternalSearchHitField.java | 0 .../org/elasticsearch/search/internal/InternalSearchHits.java | 0 .../elasticsearch/search/internal/InternalSearchRequest.java | 0 .../elasticsearch/search/internal/InternalSearchResponse.java | 0 .../java/org/elasticsearch/search/internal/ScopePhase.java | 0 .../java/org/elasticsearch/search/internal/SearchContext.java | 0 .../main/java/org/elasticsearch/search/lookup/DocLookup.java | 0 .../java/org/elasticsearch/search/lookup/FieldLookup.java | 0 .../java/org/elasticsearch/search/lookup/FieldsLookup.java | 0 .../java/org/elasticsearch/search/lookup/SearchLookup.java | 0 .../java/org/elasticsearch/search/lookup/SourceLookup.java | 0 .../elasticsearch/search/query/FilterBinaryParseElement.java | 0 .../org/elasticsearch/search/query/FilterParseElement.java | 0 .../java/org/elasticsearch/search/query/FromParseElement.java | 0 .../elasticsearch/search/query/IndicesBoostParseElement.java | 0 .../org/elasticsearch/search/query/MinScoreParseElement.java | 0 .../elasticsearch/search/query/QueryBinaryParseElement.java | 0 .../org/elasticsearch/search/query/QueryParseElement.java | 0 .../main/java/org/elasticsearch/search/query/QueryPhase.java | 0 .../search/query/QueryPhaseExecutionException.java | 0 .../org/elasticsearch/search/query/QuerySearchRequest.java | 0 .../org/elasticsearch/search/query/QuerySearchResult.java | 0 .../elasticsearch/search/query/QuerySearchResultProvider.java | 0 .../elasticsearch/search/query/ScrollQuerySearchResult.java | 0 .../java/org/elasticsearch/search/query/SizeParseElement.java | 0 .../java/org/elasticsearch/search/sort/FieldSortBuilder.java | 0 .../org/elasticsearch/search/sort/GeoDistanceSortBuilder.java | 0 .../org/elasticsearch/search/sort/GeoDistanceSortParser.java | 0 .../java/org/elasticsearch/search/sort/ScoreSortBuilder.java | 0 .../java/org/elasticsearch/search/sort/ScriptSortBuilder.java | 0 .../java/org/elasticsearch/search/sort/ScriptSortParser.java | 0 .../main/java/org/elasticsearch/search/sort/SortBuilder.java | 0 .../main/java/org/elasticsearch/search/sort/SortBuilders.java | 0 .../main/java/org/elasticsearch/search/sort/SortOrder.java | 0 .../java/org/elasticsearch/search/sort/SortParseElement.java | 0 .../main/java/org/elasticsearch/search/sort/SortParser.java | 0 .../elasticsearch/search/sort/TrackScoresParseElement.java | 0 .../main/java/org/elasticsearch/threadpool/ThreadPool.java | 0 .../java/org/elasticsearch/threadpool/ThreadPoolModule.java | 0 .../transport/ActionNotFoundTransportException.java | 0 .../org/elasticsearch/transport/ActionTransportException.java | 0 .../transport/ActionTransportRequestHandler.java | 0 .../elasticsearch/transport/BaseTransportRequestHandler.java | 0 .../elasticsearch/transport/BaseTransportResponseHandler.java | 0 .../org/elasticsearch/transport/BindTransportException.java | 0 .../elasticsearch/transport/ConnectTransportException.java | 0 .../elasticsearch/transport/FailedCommunicationException.java | 0 .../transport/FutureTransportResponseHandler.java | 0 .../elasticsearch/transport/NodeDisconnectedException.java | 0 .../elasticsearch/transport/NodeNotConnectedException.java | 0 .../transport/NotSerializableTransportException.java | 0 .../org/elasticsearch/transport/PlainTransportFuture.java | 0 .../transport/ReceiveTimeoutTransportException.java | 0 .../org/elasticsearch/transport/RemoteTransportException.java | 0 .../transport/ResponseHandlerFailureTransportException.java | 0 .../transport/ResponseHandlerNotFoundTransportException.java | 0 .../transport/SendRequestTransportException.java | 0 .../main/java/org/elasticsearch/transport/Transport.java | 0 .../java/org/elasticsearch/transport/TransportChannel.java | 0 .../elasticsearch/transport/TransportConnectionListener.java | 0 .../java/org/elasticsearch/transport/TransportException.java | 0 .../java/org/elasticsearch/transport/TransportFuture.java | 0 .../main/java/org/elasticsearch/transport/TransportInfo.java | 0 .../java/org/elasticsearch/transport/TransportModule.java | 0 .../org/elasticsearch/transport/TransportRequestHandler.java | 0 .../org/elasticsearch/transport/TransportRequestOptions.java | 0 .../org/elasticsearch/transport/TransportResponseHandler.java | 0 .../org/elasticsearch/transport/TransportResponseOptions.java | 0 .../transport/TransportSerializationException.java | 0 .../java/org/elasticsearch/transport/TransportService.java | 0 .../org/elasticsearch/transport/TransportServiceAdapter.java | 0 .../elasticsearch/transport/TransportServiceManagement.java | 0 .../main/java/org/elasticsearch/transport/TransportStats.java | 0 .../elasticsearch/transport/VoidTransportResponseHandler.java | 0 .../org/elasticsearch/transport/local/LocalTransport.java | 0 .../elasticsearch/transport/local/LocalTransportChannel.java | 0 .../transport/local/LocalTransportManagement.java | 0 .../elasticsearch/transport/local/LocalTransportModule.java | 0 .../transport/netty/ChannelBufferStreamInput.java | 0 .../elasticsearch/transport/netty/MessageChannelHandler.java | 0 .../elasticsearch/transport/netty/NettyInternalESLogger.java | 0 .../transport/netty/NettyInternalESLoggerFactory.java | 0 .../org/elasticsearch/transport/netty/NettyTransport.java | 0 .../elasticsearch/transport/netty/NettyTransportChannel.java | 0 .../transport/netty/NettyTransportManagement.java | 0 .../elasticsearch/transport/netty/NettyTransportModule.java | 0 .../org/elasticsearch/transport/support/TransportStreams.java | 0 .../src/main/java => src/main/resources}/config/names.txt | 0 .../analysis/miscellaneous/TruncateTokenFilterTests.java | 0 .../lucene/analysis/miscellaneous/UniqueTokenFilterTests.java | 0 .../apache/lucene/index/memory/CustomMemoryIndexTests.java | 0 .../java/org/elasticsearch/ElasticSearchExceptionTests.java | 0 .../src => src}/test/java/org/elasticsearch/VersionTests.java | 0 .../java/org/elasticsearch/action/bulk/BulkActionTests.java | 0 .../test/java/org/elasticsearch/action/bulk/simple-bulk.json | 0 .../test/java/org/elasticsearch/action/bulk/simple-bulk2.json | 0 .../benchmark/checksum/ChecksumBenchmarkTest.java | 0 .../common/lucene/uidscan/LuceneUidScanBenchmark.java | 0 .../common/lucene/versioned/VersionedMapBenchmark.java | 0 .../benchmark/counter/SimpleCounterBenchmark.java | 0 .../org/elasticsearch/benchmark/fs/FsAppendBenchmark.java | 0 .../elasticsearch/benchmark/get/SimpleGetActionBenchmark.java | 0 .../benchmark/percolator/EmbeddedPercolatorBenchmarkTest.java | 0 .../benchmark/percolator/SinglePercolatorStressBenchmark.java | 0 .../benchmark/search/child/ChildSearchBenchmark.java | 0 .../benchmark/search/facet/HistogramFacetSearchBenchmark.java | 0 .../search/facet/QueryFilterFacetSearchBenchmark.java | 0 .../benchmark/search/facet/TermsFacetSearchBenchmark.java | 0 .../benchmark/search/geo/GeoDistanceSearchBenchmark.java | 0 .../org/elasticsearch/benchmark/stress/NodesStressTest.java | 0 .../benchmark/stress/SingleThreadBulkStress.java | 0 .../benchmark/stress/SingleThreadIndexingStress.java | 0 .../org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java | 0 .../elasticsearch/benchmark/transport/BenchmarkMessage.java | 0 .../benchmark/transport/BenchmarkNettyLargeMessages.java | 0 .../elasticsearch/benchmark/transport/TransportBenchmark.java | 0 .../benchmark/transport/netty/NettyEchoBenchmark.java | 0 .../benchmark/trove/StringMapAdjustOrPutBenchmark.java | 0 .../org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java | 0 .../cluster/metadata/MappingMetaDataParserTests.java | 0 .../cluster/metadata/ToAndFromJsonMetaDataTests.java | 0 .../cluster/routing/allocation/AwarenessAllocationTests.java | 0 .../routing/allocation/ClusterRebalanceRoutingTests.java | 0 .../routing/allocation/ConcurrentRebalanceRoutingTests.java | 0 .../cluster/routing/allocation/DisableAllocationTests.java | 0 .../ElectReplicaAsPrimaryDuringRelocationTests.java | 0 .../cluster/routing/allocation/FailedNodeRoutingTests.java | 0 .../cluster/routing/allocation/FailedShardsRoutingTests.java | 0 .../cluster/routing/allocation/FilterRoutingTests.java | 0 .../routing/allocation/PrimaryElectionRoutingTests.java | 0 .../PrimaryNotRelocatedWhileBeingRecoveredTests.java | 0 .../cluster/routing/allocation/RebalanceAfterActiveTests.java | 0 .../routing/allocation/ReplicaAllocatedAfterPrimaryTests.java | 0 .../cluster/routing/allocation/RoutingAllocationTests.java | 0 .../cluster/routing/allocation/ShardVersioningTests.java | 0 .../routing/allocation/SingleShardNoReplicasRoutingTests.java | 0 .../routing/allocation/SingleShardOneReplicaRoutingTests.java | 0 .../routing/allocation/TenShardsOneReplicaRoutingTests.java | 0 .../cluster/routing/allocation/ThrottlingAllocationTests.java | 0 .../routing/allocation/UpdateNumberOfReplicasTests.java | 0 .../cluster/serialization/ClusterSerializationTests.java | 0 .../elasticsearch/cluster/structure/RoutingIteratorTests.java | 0 .../java/org/elasticsearch/common/bloom/BoomFilterTests.java | 0 .../elasticsearch/common/compress/CompressedStringTests.java | 0 .../test/java/org/elasticsearch/common/io/StreamsTests.java | 0 .../elasticsearch/common/io/streams/BytesStreamsTests.java | 0 .../elasticsearch/common/io/streams/HandlesStreamsTests.java | 0 .../org/elasticsearch/common/lucene/all/SimpleAllTests.java | 0 .../common/lucene/search/MatchAllDocsFilterTests.java | 0 .../common/lucene/search/MoreLikeThisQueryTests.java | 0 .../common/lucene/search/MultiPhrasePrefixQueryTests.java | 0 .../common/lucene/store/InputStreamIndexInputTests.java | 0 .../org/elasticsearch/common/lucene/uid/UidFieldTests.java | 0 .../common/lucene/versioned/AbstractVersionedMapTests.java | 0 .../common/lucene/versioned/NativeVersionedMapTests.java | 0 .../common/lucene/versioned/NonBlockingVersionedMapTests.java | 0 .../common/lucene/versioned/VersionedIndexReaderTests.java | 0 .../java/org/elasticsearch/common/path/PathTrieTests.java | 0 .../elasticsearch/common/settings/ImmutableSettingsTests.java | 0 .../java/org/elasticsearch/common/settings/bar/BarTest.java | 0 .../java/org/elasticsearch/common/settings/foo/FooTest.java | 0 .../common/settings/loader/JsonSettingsLoaderTests.java | 0 .../common/settings/loader/YamlSettingsLoaderTests.java | 0 .../elasticsearch/common/settings/loader/test-settings.json | 0 .../elasticsearch/common/settings/loader/test-settings.yml | 0 .../java/org/elasticsearch/common/unit/ByteSizeUnitTests.java | 0 .../org/elasticsearch/common/unit/ByteSizeValueTests.java | 0 .../java/org/elasticsearch/common/unit/DistanceUnitTests.java | 0 .../java/org/elasticsearch/common/unit/TimeValueTests.java | 0 .../common/util/concurrent/BlockingThreadPoolTest.java | 0 .../common/util/concurrent/ScalingThreadPoolTest.java | 0 .../concurrent/resource/AbstractAcquirableResourceTests.java | 0 .../concurrent/resource/BlockingAcquirableResourceTests.java | 0 .../resource/NonBlockingAcquirableResourceTests.java | 0 .../common/xcontent/builder/BuilderRawFieldTests.java | 0 .../common/xcontent/builder/XContentBuilderTests.java | 0 .../elasticsearch/common/xcontent/smile/JsonVsSmileTests.java | 0 .../common/xcontent/support/XContentMapValuesTests.java | 0 .../org/elasticsearch/deps/jackson/JacksonLocationTests.java | 0 .../java/org/elasticsearch/deps/joda/SimpleJodaTests.java | 0 .../org/elasticsearch/deps/lucene/LuceneFieldCacheTests.java | 0 .../java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java | 0 .../org/elasticsearch/deps/lucene/VectorHighlighterTests.java | 0 .../discovery/zen/ping/multicast/MulticastZenPingTests.java | 0 .../discovery/zen/ping/unicast/UnicastZenPingTests.java | 0 .../elasticsearch/index/aliases/IndexAliasesServiceTests.java | 0 .../org/elasticsearch/index/analysis/AnalysisModuleTests.java | 0 .../elasticsearch/index/analysis/CompoundAnalysisTests.java | 0 .../index/analysis/filter1/MyFilterTokenFilterFactory.java | 0 .../index/analysis/synonyms/SynonymsAnalysisTest.java | 0 .../org/elasticsearch/index/analysis/synonyms/synonyms.json | 0 .../org/elasticsearch/index/analysis/synonyms/synonyms.txt | 0 .../index/analysis/synonyms/synonyms_wordnet.txt | 0 .../test/java/org/elasticsearch/index/analysis/test1.json | 0 .../test/java/org/elasticsearch/index/analysis/test1.yml | 0 .../elasticsearch/index/cache/filter/FilterCacheTests.java | 0 .../index/deletionpolicy/SnapshotDeletionPolicyTests.java | 0 .../deletionpolicy/SnapshotIndexCommitExistsMatcher.java | 0 .../elasticsearch/index/engine/AbstractSimpleEngineTests.java | 0 .../index/engine/EngineSearcherTotalHitsMatcher.java | 0 .../index/engine/robin/SimpleRobinEngineTests.java | 0 .../index/field/data/doubles/DoubleFieldDataTests.java | 0 .../index/field/data/floats/FloatFieldDataTests.java | 0 .../index/field/data/ints/IntFieldDataTests.java | 0 .../index/field/data/longs/LongFieldDataTests.java | 0 .../index/field/data/shorts/ShortFieldDataTests.java | 0 .../index/field/data/strings/StringFieldDataTests.java | 0 .../org/elasticsearch/index/gateway/CommitPointsTests.java | 0 .../test/java/org/elasticsearch/index/mapper/MapperTests.java | 0 .../elasticsearch/index/mapper/all/SimpleAllMapperTests.java | 0 .../test/java/org/elasticsearch/index/mapper/all/mapping.json | 0 .../org/elasticsearch/index/mapper/all/store-mapping.json | 0 .../test/java/org/elasticsearch/index/mapper/all/test1.json | 0 .../index/mapper/analyzer/AnalyzerMapperTests.java | 0 .../elasticsearch/index/mapper/boost/BoostMappingTests.java | 0 .../index/mapper/boost/CustomBoostMappingTests.java | 0 .../index/mapper/camelcase/CamelCaseFieldNameTests.java | 0 .../index/mapper/compound/CompoundTypesTests.java | 0 .../index/mapper/date/SimpleDateMappingTests.java | 0 .../index/mapper/dynamic/DynamicMappingTests.java | 0 .../genericstore/GenericStoreDynamicTemplateTests.java | 0 .../index/mapper/dynamictemplate/genericstore/test-data.json | 0 .../mapper/dynamictemplate/genericstore/test-mapping.json | 0 .../pathmatch/PathMatchDynamicTempalteTests.java | 0 .../index/mapper/dynamictemplate/pathmatch/test-data.json | 0 .../index/mapper/dynamictemplate/pathmatch/test-mapping.json | 0 .../dynamictemplate/simple/SimpleDynamicTemplatesTests.java | 0 .../index/mapper/dynamictemplate/simple/test-data.json | 0 .../index/mapper/dynamictemplate/simple/test-mapping.json | 0 .../index/mapper/geopoint/GeohashMappingGeoPointTests.java | 0 .../mapper/geopoint/LatLonAndGeohashMappingGeoPointTests.java | 0 .../index/mapper/geopoint/LatLonMappingGeoPointTests.java | 0 .../org/elasticsearch/index/mapper/id/IdMappingTests.java | 0 .../index/mapper/index/IndexTypeMapperTests.java | 0 .../elasticsearch/index/mapper/ip/SimpleIpMappingTests.java | 0 .../index/mapper/lucene/DoubleIndexingDocTest.java | 0 .../index/mapper/merge/Test1MergeMapperTests.java | 0 .../java/org/elasticsearch/index/mapper/merge/stage1.json | 0 .../java/org/elasticsearch/index/mapper/merge/stage2.json | 0 .../index/mapper/multifield/MultiFieldTests.java | 0 .../mapper/multifield/merge/JavaMultiFieldMergeTests.java | 0 .../index/mapper/multifield/merge/test-data.json | 0 .../index/mapper/multifield/merge/test-mapping1.json | 0 .../index/mapper/multifield/merge/test-mapping2.json | 0 .../index/mapper/multifield/merge/test-mapping3.json | 0 .../index/mapper/multifield/merge/test-mapping4.json | 0 .../org/elasticsearch/index/mapper/multifield/test-data.json | 0 .../elasticsearch/index/mapper/multifield/test-mapping.json | 0 .../elasticsearch/index/mapper/nested/NestedMappingTests.java | 0 .../index/mapper/numeric/SimpleNumericTests.java | 0 .../index/mapper/object/NullValueObjectMappingTests.java | 0 .../index/mapper/overridetype/OverrideTypeMappingTests.java | 0 .../elasticsearch/index/mapper/parent/ParentMappingTests.java | 0 .../org/elasticsearch/index/mapper/path/PathMapperTests.java | 0 .../org/elasticsearch/index/mapper/path/test-mapping.json | 0 .../index/mapper/routing/RoutingTypeMapperTests.java | 0 .../elasticsearch/index/mapper/simple/SimpleMapperTests.java | 0 .../org/elasticsearch/index/mapper/simple/test-mapping.json | 0 .../elasticsearch/index/mapper/simple/test1-notype-noid.json | 0 .../org/elasticsearch/index/mapper/simple/test1-notype.json | 0 .../java/org/elasticsearch/index/mapper/simple/test1.json | 0 .../org/elasticsearch/index/mapper/size/SizeMappingTests.java | 0 .../index/mapper/source/CompressSourceMappingTests.java | 0 .../index/mapper/source/DefaultSourceMappingTests.java | 0 .../index/mapper/timestamp/TimestampMappingTests.java | 0 .../org/elasticsearch/index/mapper/ttl/TTLMappingTests.java | 0 .../index/mapper/typelevels/ParseDocumentTypeLevelsTests.java | 0 .../index/mapper/typelevels/ParseMappingTypeLevelTests.java | 0 .../index/percolator/PercolatorExecutorTests.java | 0 .../index/query/SimpleIndexQueryParserTests.java | 0 .../java/org/elasticsearch/index/query/and-filter-named.json | 0 .../test/java/org/elasticsearch/index/query/and-filter.json | 0 .../test/java/org/elasticsearch/index/query/and-filter2.json | 0 .../test/java/org/elasticsearch/index/query/bool-filter.json | 0 .../test/java/org/elasticsearch/index/query/bool.json | 0 .../java/org/elasticsearch/index/query/boosting-query.json | 0 .../org/elasticsearch/index/query/constantScore-query.json | 0 .../elasticsearch/index/query/custom-boost-factor-query.json | 0 .../java/org/elasticsearch/index/query/custom_score1.json | 0 .../test/java/org/elasticsearch/index/query/data.json | 0 .../test/java/org/elasticsearch/index/query/disMax.json | 0 .../test/java/org/elasticsearch/index/query/disMax2.json | 0 .../test/java/org/elasticsearch/index/query/field1.json | 0 .../test/java/org/elasticsearch/index/query/field2.json | 0 .../test/java/org/elasticsearch/index/query/field3.json | 0 .../java/org/elasticsearch/index/query/filtered-query.json | 0 .../java/org/elasticsearch/index/query/filtered-query2.json | 0 .../java/org/elasticsearch/index/query/filtered-query3.json | 0 .../java/org/elasticsearch/index/query/filtered-query4.json | 0 .../java/org/elasticsearch/index/query/fquery-filter.json | 0 .../java/org/elasticsearch/index/query/fuzzy-with-fields.json | 0 .../org/elasticsearch/index/query/fuzzy-with-fields2.json | 0 .../test/java/org/elasticsearch/index/query/fuzzy.json | 0 .../java/org/elasticsearch/index/query/fuzzyLikeThis.json | 0 .../org/elasticsearch/index/query/fuzzyLikeThisField.json | 0 .../org/elasticsearch/index/query/geo_boundingbox-named.json | 0 .../java/org/elasticsearch/index/query/geo_boundingbox1.json | 0 .../java/org/elasticsearch/index/query/geo_boundingbox2.json | 0 .../java/org/elasticsearch/index/query/geo_boundingbox3.json | 0 .../java/org/elasticsearch/index/query/geo_boundingbox4.json | 0 .../org/elasticsearch/index/query/geo_distance-named.json | 0 .../java/org/elasticsearch/index/query/geo_distance1.json | 0 .../java/org/elasticsearch/index/query/geo_distance10.json | 0 .../java/org/elasticsearch/index/query/geo_distance11.json | 0 .../java/org/elasticsearch/index/query/geo_distance12.json | 0 .../java/org/elasticsearch/index/query/geo_distance2.json | 0 .../java/org/elasticsearch/index/query/geo_distance3.json | 0 .../java/org/elasticsearch/index/query/geo_distance4.json | 0 .../java/org/elasticsearch/index/query/geo_distance5.json | 0 .../java/org/elasticsearch/index/query/geo_distance6.json | 0 .../java/org/elasticsearch/index/query/geo_distance7.json | 0 .../java/org/elasticsearch/index/query/geo_distance8.json | 0 .../java/org/elasticsearch/index/query/geo_distance9.json | 0 .../java/org/elasticsearch/index/query/geo_polygon-named.json | 0 .../test/java/org/elasticsearch/index/query/geo_polygon1.json | 0 .../test/java/org/elasticsearch/index/query/geo_polygon2.json | 0 .../test/java/org/elasticsearch/index/query/geo_polygon3.json | 0 .../test/java/org/elasticsearch/index/query/geo_polygon4.json | 0 .../index/query/guice/IndexQueryParserModuleTests.java | 0 .../elasticsearch/index/query/guice/MyJsonFilterParser.java | 0 .../elasticsearch/index/query/guice/MyJsonQueryParser.java | 0 .../test/java/org/elasticsearch/index/query/limit-filter.json | 0 .../test/java/org/elasticsearch/index/query/mapping.json | 0 .../test/java/org/elasticsearch/index/query/matchAll.json | 0 .../test/java/org/elasticsearch/index/query/mlt.json | 0 .../test/java/org/elasticsearch/index/query/mltField.json | 0 .../test/java/org/elasticsearch/index/query/not-filter.json | 0 .../test/java/org/elasticsearch/index/query/not-filter2.json | 0 .../test/java/org/elasticsearch/index/query/not-filter3.json | 0 .../org/elasticsearch/index/query/numeric_range-filter.json | 0 .../test/java/org/elasticsearch/index/query/or-filter.json | 0 .../test/java/org/elasticsearch/index/query/or-filter2.json | 0 .../index/query/plugin/IndexQueryParserPlugin2Tests.java | 0 .../index/query/plugin/IndexQueryParserPluginTests.java | 0 .../index/query/plugin/PluginJsonFilterParser.java | 0 .../index/query/plugin/PluginJsonQueryParser.java | 0 .../test/java/org/elasticsearch/index/query/prefix-boost.json | 0 .../org/elasticsearch/index/query/prefix-filter-named.json | 0 .../java/org/elasticsearch/index/query/prefix-filter.json | 0 .../java/org/elasticsearch/index/query/prefix-with-boost.json | 0 .../test/java/org/elasticsearch/index/query/prefix.json | 0 .../org/elasticsearch/index/query/query-fields-match.json | 0 .../java/org/elasticsearch/index/query/query-fields1.json | 0 .../java/org/elasticsearch/index/query/query-fields2.json | 0 .../java/org/elasticsearch/index/query/query-fields3.json | 0 .../test/java/org/elasticsearch/index/query/query-filter.json | 0 .../test/java/org/elasticsearch/index/query/query.json | 0 .../test/java/org/elasticsearch/index/query/query2.json | 0 .../org/elasticsearch/index/query/range-filter-named.json | 0 .../test/java/org/elasticsearch/index/query/range-filter.json | 0 .../test/java/org/elasticsearch/index/query/range.json | 0 .../test/java/org/elasticsearch/index/query/range2.json | 0 .../test/java/org/elasticsearch/index/query/spanFirst.json | 0 .../test/java/org/elasticsearch/index/query/spanNear.json | 0 .../test/java/org/elasticsearch/index/query/spanNot.json | 0 .../test/java/org/elasticsearch/index/query/spanOr.json | 0 .../test/java/org/elasticsearch/index/query/spanOr2.json | 0 .../test/java/org/elasticsearch/index/query/spanTerm.json | 0 .../java/org/elasticsearch/index/query/term-filter-named.json | 0 .../test/java/org/elasticsearch/index/query/term-filter.json | 0 .../java/org/elasticsearch/index/query/term-with-boost.json | 0 .../test/java/org/elasticsearch/index/query/term.json | 0 .../org/elasticsearch/index/query/terms-filter-named.json | 0 .../test/java/org/elasticsearch/index/query/terms-filter.json | 0 .../test/java/org/elasticsearch/index/query/terms-query.json | 0 .../test/java/org/elasticsearch/index/query/text1.json | 0 .../test/java/org/elasticsearch/index/query/text2.json | 0 .../test/java/org/elasticsearch/index/query/text3.json | 0 .../test/java/org/elasticsearch/index/query/text4.json | 0 .../test/java/org/elasticsearch/index/query/text4_2.json | 0 .../java/org/elasticsearch/index/query/wildcard-boost.json | 0 .../test/java/org/elasticsearch/index/query/wildcard.json | 0 .../org/elasticsearch/index/search/geo/GeoDistanceTests.java | 0 .../org/elasticsearch/index/search/geo/GeoHashUtilsTests.java | 0 .../index/store/memory/SimpleByteBufferStoreTests.java | 0 .../index/translog/AbstractSimpleTranslogTests.java | 0 .../org/elasticsearch/index/translog/TranslogSizeMatcher.java | 0 .../index/translog/fs/FsChannelSimpleTranslogTests.java | 0 .../test/java/org/elasticsearch/rest/util/RestUtilsTests.java | 0 .../test/java/org/elasticsearch/script/NativeScriptTests.java | 0 .../elasticsearch/test/integration/AbstractNodesTests.java | 0 .../test/integration/aliases/IndexAliasesTests.java | 0 .../test/integration/aliases/IndexAliasesTests.yml | 0 .../test/integration/broadcast/BroadcastActionsTests.java | 0 .../test/integration/broadcast/BroadcastActionsTests.yml | 0 .../client/transport/ClientTransportTwoNodesSearchTests.java | 0 .../client/transport/DiscoveryTransportClientTests.java | 0 .../client/transport/DiscoveryTransportClientTests.yml | 0 .../client/transport/TransportClientDocumentActionsTests.java | 0 .../client/transport/TransportClientDocumentActionsTests.yml | 0 .../transport/TransportClientMoreLikeThisActionTests.java | 0 .../transport/TransportClientMoreLikeThisActionTests.yml | 0 .../transport/TransportClientSniffDocumentActionsTests.java | 0 .../transport/TransportClientSniffDocumentActionsTests.yml | 0 .../test/integration/cluster/AbstractZenNodesTests.java | 0 .../test/integration/cluster/ClusterHealthTests.java | 0 .../test/integration/cluster/MinimumMasterNodesTests.java | 0 .../test/integration/cluster/SimpleDataNodesTests.java | 0 .../test/integration/cluster/SpecificMasterNodesTests.java | 0 .../cluster/allocation/AwarenessAllocationTests.java | 0 .../cluster/allocation/FilteringAllocationTests.java | 0 .../consistencylevel/WriteConsistencyLevelTests.java | 0 .../test/integration/discovery/DiscoveryTests.java | 0 .../document/AliasedIndexDocumentActionsTests.java | 0 .../integration/document/AliasedIndexDocumentActionsTests.yml | 0 .../test/integration/document/DocumentActionsTests.java | 0 .../test/integration/document/DocumentActionsTests.yml | 0 .../test/integration/document/GetActionTests.java | 0 .../test/integration/document/LocalDocumentActionsTests.java | 0 .../test/integration/document/LocalDocumentActionsTests.yml | 0 .../test/integration/document/MoreLikeThisActionTests.java | 0 .../test/integration/document/MoreLikeThisActionTests.yml | 0 .../gateway/fs/AbstractSimpleIndexGatewayTests.java | 0 .../fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java | 0 .../fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.yml | 0 .../test/integration/gateway/fs/ChunkFsIndexGatewayTests.java | 0 .../test/integration/gateway/fs/ChunkFsIndexGatewayTests.yml | 0 .../test/integration/gateway/fs/FsMetaDataGatewayTests.java | 0 .../test/integration/gateway/fs/FsMetaDataGatewayTests.yml | 0 .../integration/gateway/fs/SimpleFsIndexGatewayTests.java | 0 .../test/integration/gateway/fs/SimpleFsIndexGatewayTests.yml | 0 .../gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java | 0 .../gateway/fs/SimpleFsIndexInRamIndexGatewayTests.yml | 0 .../gateway/local/LocalGatewayIndexStateTests.java | 0 .../integration/gateway/local/QuorumLocalGatewayTests.java | 0 .../gateway/local/SimpleRecoveryLocalGatewayTests.java | 0 .../test/integration/gateway/none/RecoverAfterNodesTests.java | 0 .../integration/indexlifecycle/IndexLifecycleActionTests.java | 0 .../integration/indexlifecycle/IndexLifecycleActionTests.yml | 0 .../test/integration/indices/analyze/AnalyzeActionTests.java | 0 .../integration/indices/mapping/SimpleDeleteMappingTests.java | 0 .../indices/settings/UpdateNumberOfReplicasTests.java | 0 .../integration/indices/settings/UpdateSettingsTests.java | 0 .../test/integration/indices/state/SimpleIndexStateTests.java | 0 .../test/integration/indices/stats/SimpleIndexStatsTests.java | 0 .../test/integration/indices/store/IndicesStoreTests.java | 0 .../indices/template/SimpleIndexTemplateTests.java | 0 .../test/integration/nested/SimpleNestedTests.java | 0 .../test/integration/nodesinfo/SimpleNodesInfoTests.java | 0 .../test/integration/percolator/RecoveryPercolatorTests.java | 0 .../test/integration/percolator/SimplePercolatorTests.java | 0 .../elasticsearch/test/integration/ping/PingActionTests.java | 0 .../elasticsearch/test/integration/ping/PingActionTests.yml | 0 .../test/integration/recovery/FullRollingRestartTests.java | 0 .../integration/recovery/RecoveryWhileUnderLoadTests.java | 0 .../test/integration/recovery/SimpleRecoveryTests.java | 0 .../integration/recovery/SmallFileChunkSizeRecoveryTests.java | 0 .../integration/recovery/SmallTranslogOpsRecoveryTests.java | 0 .../integration/recovery/SmallTranslogSizeRecoveryTests.java | 0 .../test/integration/routing/AliasResolveRoutingTests.java | 0 .../test/integration/routing/AliasRoutingTests.java | 0 .../test/integration/routing/SimpleRoutingTests.java | 0 .../search/basic/SearchWhileCreatingIndexTests.java | 0 .../search/basic/TransportSearchFailuresTests.java | 0 .../search/basic/TransportTwoNodesSearchTests.java | 0 .../integration/search/child/SimpleChildQuerySearchTests.java | 0 .../search/compress/SearchSourceCompressTests.java | 0 .../search/customscore/CustomScoreSearchTests.java | 0 .../integration/search/customscore/CustomScoreSearchTests.yml | 0 .../search/embedded/SingleShardEmbeddedSearchTests.java | 0 .../SingleShardNoOptimizationEmbeddedSearchTests.java | 0 .../search/embedded/ThreeShardsEmbeddedSearchTests.java | 0 .../ThreeShardsUnbalancedShardsEmbeddedSearchTests.java | 0 .../search/facet/SimpleFacetsMultiShardMultiNodeTests.java | 0 .../integration/search/facet/SimpleFacetsMultiShardTests.java | 0 .../test/integration/search/facet/SimpleFacetsTests.java | 0 .../test/integration/search/fields/SearchFieldsTests.java | 0 .../test/integration/search/geo/GeoBoundingBoxTests.java | 0 .../test/integration/search/geo/GeoDistanceFacetTests.java | 0 .../test/integration/search/geo/GeoDistanceTests.java | 0 .../integration/search/highlight/HighlighterSearchTests.java | 0 .../search/indicesboost/SimpleIndicesBoostSearchTests.java | 0 .../search/indicesboost/SimpleIndicesBoostSearchTests.yml | 0 .../search/matchedfilters/MatchedFiltersTests.java | 0 .../integration/search/preference/SearchPreferenceTests.java | 0 .../test/integration/search/query/SimpleQueryTests.java | 0 .../integration/search/scan/SearchScanScrollingTests.java | 0 .../test/integration/search/scan/SearchScanTests.java | 0 .../search/scriptfield/ScriptFieldSearchTests.java | 0 .../search/scriptfilter/ScriptFilterSearchTests.java | 0 .../search/scriptfilter/ScriptFilterSearchTests.yml | 0 .../test/integration/search/scroll/SearchScrollTests.java | 0 .../test/integration/search/simple/SimpleSearchTests.java | 0 .../test/integration/search/sort/SimpleSortTests.java | 0 .../test/integration/search/stats/SearchStatsTests.java | 0 .../test/integration/timestamp/SimpleTimestampTests.java | 0 .../elasticsearch/test/integration/ttl/SimpleTTLTests.java | 0 .../versioning/ConcurrentDocumentOperationTests.java | 0 .../test/integration/versioning/SimpleVersioningTests.java | 0 .../org/elasticsearch/test/stress/client/ClientFailover.java | 0 .../test/stress/fullrestart/FullRestartStressTest.java | 0 .../test/stress/gcbehavior/FilterCacheGcStress.java | 0 .../java/org/elasticsearch/test/stress/get/GetStressTest.java | 0 .../java/org/elasticsearch/test/stress/get/MGetStress1.java | 0 .../test/stress/indexing/BulkIndexingStressTest.java | 0 .../stress/indexing/ConcurrentIndexingVersioningTest.java | 0 .../org/elasticsearch/test/stress/leaks/GenericStatsLeak.java | 0 .../org/elasticsearch/test/stress/leaks/JvmStatsLeak.java | 0 .../test/stress/manyindices/ManyIndicesRemoteStressTest.java | 0 .../test/stress/manyindices/ManyIndicesStressTest.java | 0 .../manyindices/ManyNodesManyIndicesRecoveryStressTest.java | 0 .../elasticsearch/test/stress/refresh/RefreshStressTest1.java | 0 .../test/stress/rollingrestart/RollingRestartStressTest.java | 0 .../test/stress/search1/ParentChildStressTest.java | 0 .../elasticsearch/test/stress/search1/Search1StressTest.java | 0 .../elasticsearch/transport/AbstractSimpleTransportTests.java | 0 .../transport/local/SimpleLocalTransportTests.java | 0 .../transport/netty/SimpleNettyTransportTests.java | 0 .../test/java/org/elasticsearch/util/StopWatchTests.java | 0 .../test/java/org/elasticsearch/util/StringsTests.java | 0 .../test/java/org/elasticsearch/util/ThreadLocalsTests.java | 0 .../java/org/elasticsearch/util/guice/InjectorsTests.java | 0 .../test/resources}/jmeter/jmx/index-count.jmx | 0 .../benchmark => src/test/resources}/jmeter/jmx/index-get.jmx | 0 .../test/resources}/jmeter/jmx/index-search.jmx | 0 .../benchmark => src/test/resources}/jmeter/jmx/index.jmx | 0 .../test/resources}/jmeter/jmx/ping-single.jmx | 0 2587 files changed, 1 insertion(+), 12 deletions(-) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/index/ExtendedIndexSearcher.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/index/memory/CustomMemoryIndex.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/ExistsFieldQueryExtension.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/FieldQueryExtension.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/MapperQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/MissingFieldQueryExtension.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/MultiFieldMapperQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/MultiFieldQueryParserSettings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/queryParser/QueryParserSettings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/search/DeletionAwareConstantScoreQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/search/PublicTermsFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/search/ShardFieldDocSortedHitQueue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/ByteBufferAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/ByteBufferDirectory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/ByteBufferFile.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/CachingByteBufferAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/apache/lucene/store/bytebuffer/PlainByteBufferAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchGenerationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchIllegalArgumentException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchIllegalStateException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchInterruptedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchNullPointerException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchParseException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchTimeoutException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ElasticSearchWrapperException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/ExceptionsHelper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/Version.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/Action.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ActionFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ActionListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ActionRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ActionRequestValidationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ActionResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/Actions.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/FailedNodeException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ListenableActionFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/NoShardAvailableActionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/NoSuchNodeException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/PrimaryMissingActionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/RoutingMissingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ShardOperationFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/ThreadingModel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/TimestampParsingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/TransportActionModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/TransportActions.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/UnavailableShardsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/WriteConsistencyLevel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/create/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/exists/TransportIndicesExistsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/delete/TransportDeleteMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/settings/TransportUpdateSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/DocsStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/GatewayRecoveryStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/GatewaySnapshotStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/PeerRecoveryStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/ShardStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/admin/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/BulkRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/BulkResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/count/CountRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/count/CountResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/count/ShardCountRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/count/ShardCountResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/count/TransportCountAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/count/pacakge-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/DeleteRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/DeleteResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/index/IndexDeleteRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/index/IndexDeleteResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/index/ShardDeleteRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/index/TransportIndexDeleteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/delete/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/deletebyquery/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/GetRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/GetResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/MultiGetRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/MultiGetResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/TransportGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/get/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/index/IndexRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/index/IndexResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/index/TransportIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/index/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/mlt/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/percolate/PercolateRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/percolate/PercolateResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/SearchOperationThreading.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/SearchRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/SearchResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/SearchScrollRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/SearchType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/ShardSearchFailure.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/TransportSearchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/AdapterActionFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/BaseAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/PlainActionFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationThreading.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/IndexReplicationOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/IndicesReplicationOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/ReplicationType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/bootstrap/Bootstrap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/bootstrap/ElasticSearch.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cache/NodeCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cache/NodeCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cache/memory/ByteBufferCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/AdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/Client.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/ClusterAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/IndicesAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/Requests.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/RequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/internal/InternalClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/internal/InternalClusterAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/internal/InternalIndicesAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/node/NodeAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/node/NodeClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/node/NodeClientModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/support/AbstractClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/ClientTransportModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/TransportClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/ClientTransportAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/reroute/ClientTransportClusterRerouteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/settings/ClientTransportClusterUpdateSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/analyze/ClientTransportAnalyzeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/close/ClientTransportCloseIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/exists/ClientTransportIndicesExistsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/delete/ClientTransportDeleteMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/put/ClientTransportPutMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/open/ClientTransportOpenIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/segments/ClientTransportIndicesSegmentsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/settings/ClientTransportUpdateSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/stats/ClientTransportIndicesStatsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/template/delete/ClientTransportDeleteIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/admin/indices/template/put/ClientTransportPutIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/bulk/ClientTransportBulkAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/get/ClientTransportMultiGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/percolate/ClientTransportPercolateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/action/support/BaseClientTransportAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterName.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterNameModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterStateListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/index/NodeAliasesUpdatedAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/block/ClusterBlock.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/AliasAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataStateIndexService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingBuilders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingNode.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingTable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/ShardIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/ShardRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/allocator/EvenShardsCountAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/allocator/GatewayAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/OperationRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/OperationRoutingModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/hash/HashFunction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/hash/djb/DjbHashFunction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/hash/simple/SimpleHashFunction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRoutingModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/cluster/service/InternalClusterService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Base64.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Booleans.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Bytes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/BytesHolder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/BytesWrap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/CacheRecycler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Classes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Digest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Hex.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Names.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Nullable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Numbers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Preconditions.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/RamUsage.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/RandomStringGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/RateLimiter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Required.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/StopWatch.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Strings.java (99%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/UUID.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/Unicode.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/BlobContainer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/BlobPath.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/BlobStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/ImmutableBlobContainer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/fs/AbstractFsBlobContainer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/fs/FsImmutableBlobContainer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/support/BlobStores.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/bloom/BloomCalculations.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/bloom/BloomFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/bloom/BloomFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/bloom/MurmurHash.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/bloom/ObsBloomFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/BoundedArrayList.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/IdentityHashSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/MapBackedSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/MapBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/ReusableIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/SafeArray.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/collect/Tuple.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/component/AbstractComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/component/CloseableComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/component/Lifecycle.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/component/LifecycleComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/component/LifecycleListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/CompressedString.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/bzip2/BZip2Constants.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/bzip2/CBZip2InputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/bzip2/CBZip2OutputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/bzip2/CRC.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/BufferRecycler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/ChunkDecoder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/ChunkEncoder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/LZF.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/LZFChunk.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/LZFDecoder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/LZFEncoder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/impl/UnsafeChunkDecoder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/impl/VanillaChunkDecoder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/compress/lzf/util/ChunkDecoderFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/AbstractModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/AbstractProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Binder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Binding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/BindingAnnotation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/BindingProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConfigurationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConstantFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConstructionProxy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConstructorInjector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ContextualCallable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/CreationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/DeferredLookups.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/EncounterImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Exposed.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/FactoryProxy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Guice.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ImplementedBy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/InheritingState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Initializable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Initializables.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Initializer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Inject.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Injector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/InjectorBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/InjectorImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/InjectorShell.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Injectors.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Key.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/LookupProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Lookups.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/MembersInjector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/MessageProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Module.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Modules.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ModulesBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/OutOfScopeException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/PreProcessModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/PrivateBinder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/PrivateModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ProvidedBy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Provider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Provides.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ProvisionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Reflection.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Scope.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Scopes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Singleton.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/SpawnModules.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/Stage.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/State.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/TypeLiteral.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/WeakKeySet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/binder/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Annotations.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/BytecodeGen.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Classes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ComputationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Errors.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/FailableCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/InternalContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Join.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Nullability.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Nullable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Objects.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Scoping.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/Strings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/UnmodifiableIterator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/internal/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/matcher/Matcher.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/matcher/Matchers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/matcher/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/multibindings/Element.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/multibindings/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/name/Named.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/name/NamedImpl.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/name/Names.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/name/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/Dependency.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/Element.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/Elements.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/Message.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/TypeListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/spi/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/util/Modules.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/util/Providers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/util/Types.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/inject/util/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/BooleanStreamable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/BytesStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/CachedStreams.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/CharSequenceReader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/CompactObjectInputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/CompactObjectOutputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FastByteArrayInputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FastByteArrayOutputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FastCharArrayReader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FastStringReader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FileChannelInputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/FileSystemUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/Serializers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/Streams.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/BytesStreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/CachedStreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/CachedStreamOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/HandlesStreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/HandlesStreamOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/LZFStreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/LongStreamable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/StreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/StreamOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/Streamable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/Streamables.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/StringStreamable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/io/stream/VoidStreamable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/jline/ANSI.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/jna/CLibrary.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/jna/Natives.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/joda/Joda.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lab/LongsLAB.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lease/Releasable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/ESLogger.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/Loggers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/log4j/JLinePatternLayout.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/Directories.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/DocumentBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/FieldBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/IndexWriters.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/Lucene.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/MultiCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/ReaderSearcherHolder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/all/AllEntries.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/all/AllField.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/analysis/HTMLStripCharFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/DocIdSetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/DocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/DocSets.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/NotDocIdSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/OrDocIdSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/document/ResetFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/document/SingleFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/AndFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/NoCacheFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/NotFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/OrFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/Queries.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/TermFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/store/NullIndexOutput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/store/SwitchDirectory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/uid/UidField.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMapLong.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/lucene/versioned/VersionedMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/math/MathRuntimeException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/math/MathUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/metrics/CounterMetric.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/metrics/EWMA.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/metrics/MeanMetric.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/metrics/MeterMetric.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/metrics/Metric.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/network/NetworkModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/network/NetworkService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/network/NetworkUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/os/OsUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/path/PathTrie.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/regex/Regex.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/ImmutableSettings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/Settings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/SettingsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/SettingsFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/SettingsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/loader/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/settings/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/thread/LoggingRunnable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/thread/ThreadLocals.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/timer/HashedWheelTimer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/timer/Timeout.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/timer/Timer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/timer/TimerTask.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/PortsRange.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/TransportAddress.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/trove/ExtTDoubleObjectHashMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/trove/ExtTHashMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/trove/ExtTIntArrayList.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/trove/ExtTLongObjectHashMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/trove/ExtTObjectIntHasMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/trove/StringIdentityHashingStrategy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/ByteSizeValue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/DistanceUnit.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/Percent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/SizeUnit.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/SizeValue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/unit/TimeValue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ConcurrentIdentityHashMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ConcurrentSafeArray.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/CopyOnWriteMap.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/DynamicExecutors.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/DynamicThreadPoolExecutor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/Immutable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/NotThreadSafe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/ThreadSafe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/TransferThreadPoolExecutor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResource.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResourceFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResource.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResource.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/ToXContent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentHelper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentString.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/XContentType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/support/XContentMapConverter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/Discovery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/DiscoveryException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/DiscoveryModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/DiscoveryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ping/ZenPingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/env/Environment.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/env/EnvironmentModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/env/FailedToResolveConfigException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/env/NodeEnvironment.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/env/NodeEnvironmentModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/Gateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/GatewayException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/GatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/GatewayService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/blobstore/BlobReuseExistingGatewayAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/fs/FsGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/LocalGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/LocalGatewayAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/LocalGatewayMetaState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/LocalGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/LocalGatewayStartedShards.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayMetaState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayStartedShards.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/none/NoneGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/none/NoneGatewayAllocator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/BindHttpException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpChannel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpServer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpServerAdapter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpServerModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpServerTransport.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/HttpStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/AbstractIndexComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/AlreadyExpiredException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/CloseableIndexComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/Index.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexNameModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexServiceManagement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/IndexShardMissingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/LocalNodeId.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/LocalNodeIdModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/VersionType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/aliases/IndexAlias.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/Analysis.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AnalysisModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AnalysisService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PositionIncrementGapAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/phonetic/DoubleMetaphoneFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/CacheStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/IndexCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/IndexCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/bloom/BloomCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/bloom/BloomCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/bloom/simple/SimpleBloomCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/FilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/node/NodeFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/resident/ResidentFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/support/AbstractWeightedFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/support/CacheKeyFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/support/FilterCacheValue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/IdCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/IdCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/IdReaderCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/IdReaderTypeCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderTypeCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCacheModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/query/parser/none/NoneQueryParserCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/query/parser/soft/SoftQueryParserCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/query/parser/support/AbstractJvmQueryParserCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/cache/query/parser/weak/WeakQueryParserCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/CloseEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/Engine.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/EngineClosedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/EngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/EngineModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/IndexEngine.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/IndexEngineModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/OptimizeFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/Segment.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/DocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/FieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/FieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/NumericFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/ByteDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataMissingComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/bytes/SingleValueByteFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataMissingComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataMissingComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataMissingComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataMissingComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataMissingComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/StringOrdValFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/strings/StringValFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/data/support/NumericFieldDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/function/sort/DoubleFieldsFunctionDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/field/function/sort/StringFieldsFunctionDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/flush/FlushStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/CommitPoint.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/CommitPoints.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/RecoveryStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexShardGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/local/LocalIndexGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/local/LocalIndexGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/get/GetField.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/get/GetResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/get/GetStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/get/ShardGetModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/get/ShardGetService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/indexing/IndexingStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/ContentPath.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/DocumentMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/FailedToGenerateSourceMapperException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/FieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/FieldMapperListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/FieldMappers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/InternalMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/Mapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MapperBuilders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MapperException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MapperParsingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MapperService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MergeContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/MergeMappingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/ObjectMapperListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/ObjectMappers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/ParseContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/ParsedDocument.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/RootMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/SourceToParse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/Uid.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/default-mapping.json (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/GeoPoint.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/GeoPointDocFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldDataType.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/geo/SingleValueGeoPointFieldData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/AnalyzerMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/BoostFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/SourceFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/selector/AllButSourceFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/selector/FieldMappersFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/selector/UidAndSourceFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/mapper/selector/UidFieldSelector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/MergeStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/policy/EnableMergePolicy.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/percolator/PercolateIndexUnavailable.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/percolator/PercolatorException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/percolator/PercolatorModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/percolator/PercolatorService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/AndFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/AndFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BoolFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BoolFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BoolQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/BoostingQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/CustomScoreQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/CustomScoreQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ExistsFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ExistsFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FQueryFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FieldQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FieldQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FilterBuilders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FilterParserFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FilteredQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoDistanceFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoPolygonFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/GeoPolygonFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/HasChildFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/HasChildFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/HasChildQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IdsFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IdsFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IdsQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IndexQueryParserService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/IndicesQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/LimitFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/LimitFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MatchAllFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MissingFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MissingFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NestedFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NestedFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NestedQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NotFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NotFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NumericRangeFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/NumericRangeFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/OrFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/OrFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ParsedQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/PrefixFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/PrefixFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/PrefixQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryBuilderException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryBuilders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryParseContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryParserFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryParsingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/RangeFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/RangeFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/RangeQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ScriptFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/ScriptFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermsFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermsFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TermsQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TextQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TextQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TopChildrenQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TopChildrenQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TypeFilterBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/TypeFilterParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/WildcardQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/WrapperQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/query/support/QueryParsers.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/refresh/RefreshStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/TextQueryParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/UidFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/child/ChildCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/child/HasChildFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoDistance.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoDistanceDataComparator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoHashUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/GeoUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/geo/Point.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/nested/NestedChildrenCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/nested/NestedDocsFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/stats/SearchStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/service/IndexService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/service/InternalIndexService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/settings/IndexSettings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/settings/IndexSettingsService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/DocsStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardManagement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/IndexShardState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/ShardId.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/service/IndexShard.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/similarity/SimilarityModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/similarity/SimilarityProviderFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/similarity/SimilarityService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/DirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/IndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/IndexStoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/Store.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/StoreException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/StoreFileMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/StoreManagement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/StoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/StoreStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/FsDirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/FsIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/NioFsIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/NioFsIndexStoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/memory/ByteBufferIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/memory/MemoryIndexStoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/ram/RamIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/ram/RamIndexStoreModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/support/AbstractIndexStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/store/support/ForceSyncDirectory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/Translog.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/TranslogException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/TranslogModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/TranslogService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/TranslogStreams.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/index/translog/fs/RafReference.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/AliasFilterParsingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndexCreationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndexMissingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndicesLifecycle.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndicesModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/IndicesService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/InternalIndicesService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/InvalidAliasNameException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/InvalidIndexNameException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/InvalidTypeNameException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/NodeIndicesStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/TypeMissingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/cache/filter/IndicesNodeFilterCache.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/memory/IndexingMemoryBufferController.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoverySource.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/store/IndicesStore.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/JmxClusterService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/JmxConnectorCreationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/JmxException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/JmxModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/JmxRegistrationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/JmxService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/MBean.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/ManagedAttribute.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/ManagedGroupName.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/ManagedOperation.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/ResourceDMBean.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/MonitorModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/MonitorService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/AbstractDump.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/Dump.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpContributionFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpContributor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpContributorFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpGenerationFailedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/SimpleDump.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/SimpleDumpGenerator.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/jvm/JvmService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/jvm/JvmStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/network/NetworkInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/network/NetworkProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/network/NetworkService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/network/NetworkStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/os/OsInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/os/OsProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/os/OsService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/os/OsStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/process/ProcessInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/process/ProcessProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/process/ProcessService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/process/ProcessStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/monitor/sigar/SigarService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/Node.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/NodeBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/NodeClosedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/internal/InternalNode.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/internal/InternalSettingsPerparer.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/internal/NodeModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/package-info.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/service/NodeService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/node/settings/NodeSettingsService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/AbstractPlugin.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/IndexPluginsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/Plugin.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/PluginManager.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/PluginsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/PluginsService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/AbstractRestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/BaseRestHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/BytesRestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestChannel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestController.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/RestStatus.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/StringRestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/Utf8RestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/XContentRestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/XContentThrowableRestResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/RestActionModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestGetIndicesAliasesAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/exists/RestIndicesExistsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/mapping/delete/RestDeleteMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/count/RestCountAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/get/RestGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/main/RestMainAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/main/quotes.json (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/support/RestActions.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/support/AbstractRestRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/rest/support/RestUtils.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/AbstractRiverComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/River.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverComponent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverIndexName.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverName.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverNameModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiverSettings.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiversManager.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiversModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiversPluginsModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiversService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/RiversTypesRegistry.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/RiverClusterService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/RiverClusterState.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/dummy/DummyRiver.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/routing/RiverRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/routing/RiversRouter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/river/routing/RiversRouting.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/AbstractExecutableScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/AbstractLongSearchScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/AbstractSearchScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/CompiledScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/ExecutableScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/NativeScriptEngineService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/NativeScriptFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/ScriptEngineService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/ScriptException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/ScriptModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/ScriptService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/SearchScript.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/Scroll.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchContextException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchContextMissingException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchHit.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchHitField.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchHits.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchParseException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchPhaseResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/SearchShardTarget.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/TransportSearchModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/action/SearchServiceListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/controller/ScoreDocQueue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/controller/SearchPhaseController.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/controller/ShardDoc.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/controller/ShardFieldDoc.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/controller/ShardScoreDoc.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/count/CountSearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/dfs/CachedDfSource.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/dfs/DfsPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/AbstractFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/Facet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetBinaryParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetBuilders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetPhaseExecutionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/FacetProcessors.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/Facets.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/InternalFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/InternalFacets.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/OptimizeGlobalFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/SearchContextFacets.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/TransportFacetModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/CountDateHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/InternalCountDateHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/InternalDateHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/InternalFullDateHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/ValueDateHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/datehistogram/ValueScriptDateHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/filter/FilterFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/filter/InternalFilterFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/InternalGeoDistanceFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/ScriptGeoDistanceFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/geodistance/ValueGeoDistanceFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/HistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/HistogramScriptFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/InternalHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedCountHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueScriptHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedCountHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedFullHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/CountHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/FullHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalCountHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalFullHistogramFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/ScriptHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueScriptHistogramFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/query/InternalQueryFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/query/QueryFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/query/QueryFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/query/QueryFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/InternalRangeFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/RangeFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/RangeFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/RangeFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/RangeScriptFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/range/ScriptRangeFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/InternalStatisticalFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/ScriptStatisticalFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/statistical/StatisticalScriptFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/InternalTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/TermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/TermsFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/TermsFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/bytes/InternalByteTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/doubles/InternalDoubleTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/floats/InternalFloatTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/index/IndexNameFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/ints/InternalIntTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/ip/InternalIpTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/longs/InternalLongTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/shorts/InternalShortTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/strings/FieldsTermsStringFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/strings/InternalStringTermsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringOrdinalsFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/terms/support/EntryPriorityQueue.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/InternalTermsStatsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetProcessor.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/doubles/InternalTermsStatsDoubleFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/doubles/TermsStatsDoubleFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/longs/InternalTermsStatsLongFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/longs/TermsStatsLongFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/strings/InternalTermsStatsStringFacet.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetCollector.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FetchPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FetchSearchRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/matchedfilters/MatchedFiltersFetchSubPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/HighlightField.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/HighlightPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/InternalSearchHit.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/InternalSearchHits.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/InternalSearchRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/ScopePhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/internal/SearchContext.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/lookup/DocLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/lookup/FieldLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/lookup/FieldsLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/lookup/SearchLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/lookup/SourceLookup.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/FilterParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/FromParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/MinScoreParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QueryParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QueryPhase.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QuerySearchRequest.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QuerySearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/query/SizeParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/ScriptSortParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/SortBuilder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/SortBuilders.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/SortOrder.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/SortParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/SortParser.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/threadpool/ThreadPool.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ActionTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ActionTransportRequestHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/BaseTransportRequestHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/BindTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ConnectTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/FailedCommunicationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/NodeDisconnectedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/NodeNotConnectedException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/NotSerializableTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/PlainTransportFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/RemoteTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/SendRequestTransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/Transport.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportChannel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportConnectionListener.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportFuture.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportInfo.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportRequestHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportRequestOptions.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportResponseHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportResponseOptions.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportSerializationException.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportService.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportServiceAdapter.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportServiceManagement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/TransportStats.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/VoidTransportResponseHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/local/LocalTransport.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/local/LocalTransportModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/NettyTransport.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java (100%) rename {modules/elasticsearch/src => src}/main/java/org/elasticsearch/transport/support/TransportStreams.java (100%) rename {modules/elasticsearch/src/main/java => src/main/resources}/config/names.txt (100%) rename {modules/elasticsearch/src => src}/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/apache/lucene/index/memory/CustomMemoryIndexTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/ElasticSearchExceptionTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/VersionTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/action/bulk/BulkActionTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/action/bulk/simple-bulk.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/action/bulk/simple-bulk2.json (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmarkTest.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/common/lucene/versioned/VersionedMapBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/percolator/EmbeddedPercolatorBenchmarkTest.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/percolator/SinglePercolatorStressBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/stress/NodesStressTest.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/transport/BenchmarkMessage.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/trove/StringMapAdjustOrPutBenchmark.java (100%) rename {modules/benchmark/micro/src/main => src/test}/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/bloom/BoomFilterTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/compress/CompressedStringTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/io/StreamsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/uid/UidFieldTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/versioned/AbstractVersionedMapTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMapTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/versioned/NonBlockingVersionedMapTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReaderTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/path/PathTrieTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/bar/BarTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/foo/FooTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/loader/test-settings.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/settings/loader/test-settings.yml (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/unit/TimeValueTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/util/concurrent/BlockingThreadPoolTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/util/concurrent/ScalingThreadPoolTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/util/concurrent/resource/AbstractAcquirableResourceTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResourceTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResourceTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/deps/lucene/LuceneFieldCacheTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/test1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/analysis/test1.yml (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/engine/AbstractSimpleEngineTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/MapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/all/mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/all/store-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/all/test1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTempalteTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/geopoint/GeohashMappingGeoPointTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/geopoint/LatLonAndGeohashMappingGeoPointTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/geopoint/LatLonMappingGeoPointTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/merge/Test1MergeMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/merge/stage1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/merge/stage2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/test-data.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/path/test-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/simple/test1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/percolator/PercolatorExecutorTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/and-filter-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/and-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/and-filter2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/bool-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/bool.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/boosting-query.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/constantScore-query.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/custom_score1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/data.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/disMax.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/disMax2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/field1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/field2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/field3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/filtered-query.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/filtered-query2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/filtered-query3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/filtered-query4.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/fquery-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/fuzzy.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_boundingbox1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_boundingbox2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_boundingbox3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_boundingbox4.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance10.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance11.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance12.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance4.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance5.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance6.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance7.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance8.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_distance9.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_polygon-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_polygon1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_polygon2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_polygon3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/geo_polygon4.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/limit-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/mapping.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/matchAll.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/mlt.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/mltField.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/not-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/not-filter2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/not-filter3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/numeric_range-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/or-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/or-filter2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/prefix-boost.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/prefix-filter-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/prefix-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/prefix-with-boost.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/prefix.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query-fields-match.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query-fields1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query-fields2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query-fields3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/query2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/range-filter-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/range-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/range.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/range2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/spanFirst.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/spanNear.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/spanNot.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/spanOr.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/spanOr2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/spanTerm.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/term-filter-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/term-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/term-with-boost.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/term.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/terms-filter-named.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/terms-filter.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/terms-query.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/text1.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/text2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/text3.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/text4.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/text4_2.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/wildcard-boost.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/query/wildcard.json (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/index/translog/fs/FsChannelSimpleTranslogTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/rest/util/RestUtilsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/script/NativeScriptTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/ClientTransportTwoNodesSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/GetActionTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/ping/PingActionTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/ping/PingActionTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardEmbeddedSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardNoOptimizationEmbeddedSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsEmbeddedSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsUnbalancedShardsEmbeddedSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/scriptfield/ScriptFieldSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/client/ClientFailover.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/gcbehavior/FilterCacheGcStress.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/get/GetStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/get/MGetStress1.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/indexing/ConcurrentIndexingVersioningTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/leaks/GenericStatsLeak.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/leaks/JvmStatsLeak.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesRemoteStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/manyindices/ManyNodesManyIndicesRecoveryStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/refresh/RefreshStressTest1.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java (100%) rename {modules/test/integration/src => src}/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/util/StopWatchTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/util/StringsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/util/ThreadLocalsTests.java (100%) rename {modules/elasticsearch/src => src}/test/java/org/elasticsearch/util/guice/InjectorsTests.java (100%) rename {modules/benchmark => src/test/resources}/jmeter/jmx/index-count.jmx (100%) rename {modules/benchmark => src/test/resources}/jmeter/jmx/index-get.jmx (100%) rename {modules/benchmark => src/test/resources}/jmeter/jmx/index-search.jmx (100%) rename {modules/benchmark => src/test/resources}/jmeter/jmx/index.jmx (100%) rename {modules/benchmark => src/test/resources}/jmeter/jmx/ping-single.jmx (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 8da55ea3b4f..a7f28b484ac 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,7 @@ - - - - diff --git a/.idea/modules/benchmark-micro.iml b/.idea/modules/benchmark-micro.iml index 66de07d6156..1cff9b8f4d5 100644 --- a/.idea/modules/benchmark-micro.iml +++ b/.idea/modules/benchmark-micro.iml @@ -5,8 +5,6 @@ - - diff --git a/.idea/modules/elasticsearch-root.iml b/.idea/modules/elasticsearch-root.iml index f762beaf0fa..d5b80a8ab48 100644 --- a/.idea/modules/elasticsearch-root.iml +++ b/.idea/modules/elasticsearch-root.iml @@ -15,8 +15,6 @@ - - diff --git a/.idea/modules/elasticsearch.iml b/.idea/modules/elasticsearch.iml index e94de092a8f..f4fd69d576b 100644 --- a/.idea/modules/elasticsearch.iml +++ b/.idea/modules/elasticsearch.iml @@ -5,8 +5,6 @@ - - diff --git a/.idea/modules/test-integration.iml b/.idea/modules/test-integration.iml index 0d3988782e6..413a83ea963 100644 --- a/.idea/modules/test-integration.iml +++ b/.idea/modules/test-integration.iml @@ -5,7 +5,6 @@ - diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java b/src/main/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java rename to src/main/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java b/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java rename to src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java b/src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java rename to src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java b/src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java rename to src/main/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java b/src/main/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java rename to src/main/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java b/src/main/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java rename to src/main/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/index/ExtendedIndexSearcher.java b/src/main/java/org/apache/lucene/index/ExtendedIndexSearcher.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/index/ExtendedIndexSearcher.java rename to src/main/java/org/apache/lucene/index/ExtendedIndexSearcher.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java b/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java rename to src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java b/src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java rename to src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/index/memory/CustomMemoryIndex.java b/src/main/java/org/apache/lucene/index/memory/CustomMemoryIndex.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/index/memory/CustomMemoryIndex.java rename to src/main/java/org/apache/lucene/index/memory/CustomMemoryIndex.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/ExistsFieldQueryExtension.java b/src/main/java/org/apache/lucene/queryParser/ExistsFieldQueryExtension.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/ExistsFieldQueryExtension.java rename to src/main/java/org/apache/lucene/queryParser/ExistsFieldQueryExtension.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/FieldQueryExtension.java b/src/main/java/org/apache/lucene/queryParser/FieldQueryExtension.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/FieldQueryExtension.java rename to src/main/java/org/apache/lucene/queryParser/FieldQueryExtension.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MapperQueryParser.java b/src/main/java/org/apache/lucene/queryParser/MapperQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MapperQueryParser.java rename to src/main/java/org/apache/lucene/queryParser/MapperQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MissingFieldQueryExtension.java b/src/main/java/org/apache/lucene/queryParser/MissingFieldQueryExtension.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MissingFieldQueryExtension.java rename to src/main/java/org/apache/lucene/queryParser/MissingFieldQueryExtension.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MultiFieldMapperQueryParser.java b/src/main/java/org/apache/lucene/queryParser/MultiFieldMapperQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MultiFieldMapperQueryParser.java rename to src/main/java/org/apache/lucene/queryParser/MultiFieldMapperQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MultiFieldQueryParserSettings.java b/src/main/java/org/apache/lucene/queryParser/MultiFieldQueryParserSettings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/MultiFieldQueryParserSettings.java rename to src/main/java/org/apache/lucene/queryParser/MultiFieldQueryParserSettings.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/QueryParserSettings.java b/src/main/java/org/apache/lucene/queryParser/QueryParserSettings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/queryParser/QueryParserSettings.java rename to src/main/java/org/apache/lucene/queryParser/QueryParserSettings.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/search/DeletionAwareConstantScoreQuery.java b/src/main/java/org/apache/lucene/search/DeletionAwareConstantScoreQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/search/DeletionAwareConstantScoreQuery.java rename to src/main/java/org/apache/lucene/search/DeletionAwareConstantScoreQuery.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/search/PublicTermsFilter.java b/src/main/java/org/apache/lucene/search/PublicTermsFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/search/PublicTermsFilter.java rename to src/main/java/org/apache/lucene/search/PublicTermsFilter.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/search/ShardFieldDocSortedHitQueue.java b/src/main/java/org/apache/lucene/search/ShardFieldDocSortedHitQueue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/search/ShardFieldDocSortedHitQueue.java rename to src/main/java/org/apache/lucene/search/ShardFieldDocSortedHitQueue.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java b/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java rename to src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferAllocator.java b/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferAllocator.java rename to src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferDirectory.java b/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferDirectory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferDirectory.java rename to src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferDirectory.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferFile.java b/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferFile.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferFile.java rename to src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferFile.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexInput.java b/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexInput.java rename to src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexInput.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexOutput.java b/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexOutput.java rename to src/main/java/org/apache/lucene/store/bytebuffer/ByteBufferIndexOutput.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/CachingByteBufferAllocator.java b/src/main/java/org/apache/lucene/store/bytebuffer/CachingByteBufferAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/CachingByteBufferAllocator.java rename to src/main/java/org/apache/lucene/store/bytebuffer/CachingByteBufferAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/PlainByteBufferAllocator.java b/src/main/java/org/apache/lucene/store/bytebuffer/PlainByteBufferAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/apache/lucene/store/bytebuffer/PlainByteBufferAllocator.java rename to src/main/java/org/apache/lucene/store/bytebuffer/PlainByteBufferAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchException.java b/src/main/java/org/elasticsearch/ElasticSearchException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchException.java rename to src/main/java/org/elasticsearch/ElasticSearchException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchGenerationException.java b/src/main/java/org/elasticsearch/ElasticSearchGenerationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchGenerationException.java rename to src/main/java/org/elasticsearch/ElasticSearchGenerationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchIllegalArgumentException.java b/src/main/java/org/elasticsearch/ElasticSearchIllegalArgumentException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchIllegalArgumentException.java rename to src/main/java/org/elasticsearch/ElasticSearchIllegalArgumentException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchIllegalStateException.java b/src/main/java/org/elasticsearch/ElasticSearchIllegalStateException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchIllegalStateException.java rename to src/main/java/org/elasticsearch/ElasticSearchIllegalStateException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchInterruptedException.java b/src/main/java/org/elasticsearch/ElasticSearchInterruptedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchInterruptedException.java rename to src/main/java/org/elasticsearch/ElasticSearchInterruptedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchNullPointerException.java b/src/main/java/org/elasticsearch/ElasticSearchNullPointerException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchNullPointerException.java rename to src/main/java/org/elasticsearch/ElasticSearchNullPointerException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchParseException.java b/src/main/java/org/elasticsearch/ElasticSearchParseException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchParseException.java rename to src/main/java/org/elasticsearch/ElasticSearchParseException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchTimeoutException.java b/src/main/java/org/elasticsearch/ElasticSearchTimeoutException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchTimeoutException.java rename to src/main/java/org/elasticsearch/ElasticSearchTimeoutException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchWrapperException.java b/src/main/java/org/elasticsearch/ElasticSearchWrapperException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ElasticSearchWrapperException.java rename to src/main/java/org/elasticsearch/ElasticSearchWrapperException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/ExceptionsHelper.java b/src/main/java/org/elasticsearch/ExceptionsHelper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/ExceptionsHelper.java rename to src/main/java/org/elasticsearch/ExceptionsHelper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/Version.java b/src/main/java/org/elasticsearch/Version.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/Version.java rename to src/main/java/org/elasticsearch/Version.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/Action.java b/src/main/java/org/elasticsearch/action/Action.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/Action.java rename to src/main/java/org/elasticsearch/action/Action.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionFuture.java b/src/main/java/org/elasticsearch/action/ActionFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionFuture.java rename to src/main/java/org/elasticsearch/action/ActionFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionListener.java b/src/main/java/org/elasticsearch/action/ActionListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionListener.java rename to src/main/java/org/elasticsearch/action/ActionListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionRequest.java b/src/main/java/org/elasticsearch/action/ActionRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionRequest.java rename to src/main/java/org/elasticsearch/action/ActionRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java b/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java rename to src/main/java/org/elasticsearch/action/ActionRequestValidationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionResponse.java b/src/main/java/org/elasticsearch/action/ActionResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ActionResponse.java rename to src/main/java/org/elasticsearch/action/ActionResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/Actions.java b/src/main/java/org/elasticsearch/action/Actions.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/Actions.java rename to src/main/java/org/elasticsearch/action/Actions.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/FailedNodeException.java b/src/main/java/org/elasticsearch/action/FailedNodeException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/FailedNodeException.java rename to src/main/java/org/elasticsearch/action/FailedNodeException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ListenableActionFuture.java b/src/main/java/org/elasticsearch/action/ListenableActionFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ListenableActionFuture.java rename to src/main/java/org/elasticsearch/action/ListenableActionFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java b/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java rename to src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/NoSuchNodeException.java b/src/main/java/org/elasticsearch/action/NoSuchNodeException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/NoSuchNodeException.java rename to src/main/java/org/elasticsearch/action/NoSuchNodeException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java b/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java rename to src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/RoutingMissingException.java b/src/main/java/org/elasticsearch/action/RoutingMissingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/RoutingMissingException.java rename to src/main/java/org/elasticsearch/action/RoutingMissingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java b/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java rename to src/main/java/org/elasticsearch/action/ShardOperationFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/ThreadingModel.java b/src/main/java/org/elasticsearch/action/ThreadingModel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/ThreadingModel.java rename to src/main/java/org/elasticsearch/action/ThreadingModel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/TimestampParsingException.java b/src/main/java/org/elasticsearch/action/TimestampParsingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/TimestampParsingException.java rename to src/main/java/org/elasticsearch/action/TimestampParsingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java b/src/main/java/org/elasticsearch/action/TransportActionModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java rename to src/main/java/org/elasticsearch/action/TransportActionModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActions.java b/src/main/java/org/elasticsearch/action/TransportActions.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActions.java rename to src/main/java/org/elasticsearch/action/TransportActions.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/UnavailableShardsException.java b/src/main/java/org/elasticsearch/action/UnavailableShardsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/UnavailableShardsException.java rename to src/main/java/org/elasticsearch/action/UnavailableShardsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java b/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java rename to src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastShardPingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/IndexReplicationPingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportIndexReplicationPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportReplicationPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/single/TransportSinglePingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java rename to src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java rename to src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java rename to src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/exists/TransportIndicesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/TransportIndicesExistsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/exists/TransportIndicesExistsAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/exists/TransportIndicesExistsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/TransportGatewaySnapshotAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/TransportDeleteMappingAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/TransportDeleteMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/TransportDeleteMappingAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/TransportDeleteMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/settings/TransportUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/TransportUpdateSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/settings/TransportUpdateSettingsAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/settings/TransportUpdateSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStats.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/DocsStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/DocsStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/DocsStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/DocsStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/GatewayRecoveryStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/GatewayRecoveryStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/GatewayRecoveryStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/GatewayRecoveryStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/GatewaySnapshotStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/GatewaySnapshotStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/GatewaySnapshotStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/GatewaySnapshotStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/IndexShardStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/IndexStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/PeerRecoveryStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/PeerRecoveryStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/PeerRecoveryStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/PeerRecoveryStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/ShardStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/status/ShardStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/ShardStatus.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/ShardStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java b/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/package-info.java b/src/main/java/org/elasticsearch/action/admin/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/package-info.java rename to src/main/java/org/elasticsearch/action/admin/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java rename to src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java rename to src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java rename to src/main/java/org/elasticsearch/action/bulk/BulkRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java b/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java rename to src/main/java/org/elasticsearch/action/bulk/BulkResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java rename to src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java b/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java rename to src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java rename to src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java rename to src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java b/src/main/java/org/elasticsearch/action/count/CountRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java rename to src/main/java/org/elasticsearch/action/count/CountRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountResponse.java b/src/main/java/org/elasticsearch/action/count/CountResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountResponse.java rename to src/main/java/org/elasticsearch/action/count/CountResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/ShardCountRequest.java b/src/main/java/org/elasticsearch/action/count/ShardCountRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/count/ShardCountRequest.java rename to src/main/java/org/elasticsearch/action/count/ShardCountRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/ShardCountResponse.java b/src/main/java/org/elasticsearch/action/count/ShardCountResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/count/ShardCountResponse.java rename to src/main/java/org/elasticsearch/action/count/ShardCountResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java b/src/main/java/org/elasticsearch/action/count/TransportCountAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java rename to src/main/java/org/elasticsearch/action/count/TransportCountAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/pacakge-info.java b/src/main/java/org/elasticsearch/action/count/pacakge-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/count/pacakge-info.java rename to src/main/java/org/elasticsearch/action/count/pacakge-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java rename to src/main/java/org/elasticsearch/action/delete/DeleteRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java b/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java rename to src/main/java/org/elasticsearch/action/delete/DeleteResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java rename to src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/IndexDeleteRequest.java b/src/main/java/org/elasticsearch/action/delete/index/IndexDeleteRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/IndexDeleteRequest.java rename to src/main/java/org/elasticsearch/action/delete/index/IndexDeleteRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/IndexDeleteResponse.java b/src/main/java/org/elasticsearch/action/delete/index/IndexDeleteResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/IndexDeleteResponse.java rename to src/main/java/org/elasticsearch/action/delete/index/IndexDeleteResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteRequest.java b/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteRequest.java rename to src/main/java/org/elasticsearch/action/delete/index/ShardDeleteRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java b/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java rename to src/main/java/org/elasticsearch/action/delete/index/ShardDeleteResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportIndexDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/index/TransportIndexDeleteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportIndexDeleteAction.java rename to src/main/java/org/elasticsearch/action/delete/index/TransportIndexDeleteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java rename to src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/package-info.java b/src/main/java/org/elasticsearch/action/delete/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/package-info.java rename to src/main/java/org/elasticsearch/action/delete/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java b/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java rename to src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryResponse.java b/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryResponse.java rename to src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryRequest.java b/src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryRequest.java rename to src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponse.java b/src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponse.java rename to src/main/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java b/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java rename to src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryResponse.java b/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryResponse.java rename to src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java b/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java rename to src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java b/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java rename to src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java b/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java rename to src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/package-info.java b/src/main/java/org/elasticsearch/action/deletebyquery/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/package-info.java rename to src/main/java/org/elasticsearch/action/deletebyquery/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetRequest.java b/src/main/java/org/elasticsearch/action/get/GetRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetRequest.java rename to src/main/java/org/elasticsearch/action/get/GetRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java b/src/main/java/org/elasticsearch/action/get/GetResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/GetResponse.java rename to src/main/java/org/elasticsearch/action/get/GetResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java b/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java rename to src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java rename to src/main/java/org/elasticsearch/action/get/MultiGetRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java b/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java rename to src/main/java/org/elasticsearch/action/get/MultiGetResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java rename to src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java b/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java rename to src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java rename to src/main/java/org/elasticsearch/action/get/TransportGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java rename to src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java rename to src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/get/package-info.java b/src/main/java/org/elasticsearch/action/get/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/get/package-info.java rename to src/main/java/org/elasticsearch/action/get/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/src/main/java/org/elasticsearch/action/index/IndexRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/index/IndexRequest.java rename to src/main/java/org/elasticsearch/action/index/IndexRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/src/main/java/org/elasticsearch/action/index/IndexResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/index/IndexResponse.java rename to src/main/java/org/elasticsearch/action/index/IndexResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java rename to src/main/java/org/elasticsearch/action/index/TransportIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/package-info.java b/src/main/java/org/elasticsearch/action/index/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/index/package-info.java rename to src/main/java/org/elasticsearch/action/index/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java rename to src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java b/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java rename to src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/package-info.java b/src/main/java/org/elasticsearch/action/mlt/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/package-info.java rename to src/main/java/org/elasticsearch/action/mlt/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java b/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java rename to src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java b/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java rename to src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java rename to src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java b/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java rename to src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchOperationThreading.java b/src/main/java/org/elasticsearch/action/search/SearchOperationThreading.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchOperationThreading.java rename to src/main/java/org/elasticsearch/action/search/SearchOperationThreading.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java b/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java rename to src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/src/main/java/org/elasticsearch/action/search/SearchRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java rename to src/main/java/org/elasticsearch/action/search/SearchRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/src/main/java/org/elasticsearch/action/search/SearchResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java rename to src/main/java/org/elasticsearch/action/search/SearchResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java b/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java rename to src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchType.java b/src/main/java/org/elasticsearch/action/search/SearchType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchType.java rename to src/main/java/org/elasticsearch/action/search/SearchType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java b/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java rename to src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java rename to src/main/java/org/elasticsearch/action/search/TransportSearchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java rename to src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/package-info.java b/src/main/java/org/elasticsearch/action/search/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/package-info.java rename to src/main/java/org/elasticsearch/action/search/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java b/src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java rename to src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchCache.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchCache.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java rename to src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java b/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java rename to src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java b/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java rename to src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/BaseAction.java b/src/main/java/org/elasticsearch/action/support/BaseAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/BaseAction.java rename to src/main/java/org/elasticsearch/action/support/BaseAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java b/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java rename to src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java b/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java rename to src/main/java/org/elasticsearch/action/support/PlainActionFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java b/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java rename to src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationThreading.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationThreading.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationThreading.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationThreading.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java rename to src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java rename to src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java b/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java b/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java b/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java b/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java rename to src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/IndexReplicationOperationRequest.java b/src/main/java/org/elasticsearch/action/support/replication/IndexReplicationOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/IndexReplicationOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/replication/IndexReplicationOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/IndicesReplicationOperationRequest.java b/src/main/java/org/elasticsearch/action/support/replication/IndicesReplicationOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/IndicesReplicationOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/replication/IndicesReplicationOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java b/src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java rename to src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/ReplicationType.java b/src/main/java/org/elasticsearch/action/support/replication/ReplicationType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/ReplicationType.java rename to src/main/java/org/elasticsearch/action/support/replication/ReplicationType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java b/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java b/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java rename to src/main/java/org/elasticsearch/action/support/replication/TransportIndexReplicationOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java b/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java rename to src/main/java/org/elasticsearch/action/support/replication/TransportIndicesReplicationOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java b/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java rename to src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java b/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java b/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java rename to src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java b/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java rename to src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java rename to src/main/java/org/elasticsearch/bootstrap/Bootstrap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/ElasticSearch.java b/src/main/java/org/elasticsearch/bootstrap/ElasticSearch.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/ElasticSearch.java rename to src/main/java/org/elasticsearch/bootstrap/ElasticSearch.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cache/NodeCache.java b/src/main/java/org/elasticsearch/cache/NodeCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cache/NodeCache.java rename to src/main/java/org/elasticsearch/cache/NodeCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cache/NodeCacheModule.java b/src/main/java/org/elasticsearch/cache/NodeCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cache/NodeCacheModule.java rename to src/main/java/org/elasticsearch/cache/NodeCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cache/memory/ByteBufferCache.java b/src/main/java/org/elasticsearch/cache/memory/ByteBufferCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cache/memory/ByteBufferCache.java rename to src/main/java/org/elasticsearch/cache/memory/ByteBufferCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/AdminClient.java b/src/main/java/org/elasticsearch/client/AdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/AdminClient.java rename to src/main/java/org/elasticsearch/client/AdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/Client.java b/src/main/java/org/elasticsearch/client/Client.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/Client.java rename to src/main/java/org/elasticsearch/client/Client.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/ClusterAdminClient.java b/src/main/java/org/elasticsearch/client/ClusterAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/ClusterAdminClient.java rename to src/main/java/org/elasticsearch/client/ClusterAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/IndicesAdminClient.java rename to src/main/java/org/elasticsearch/client/IndicesAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/Requests.java b/src/main/java/org/elasticsearch/client/Requests.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/Requests.java rename to src/main/java/org/elasticsearch/client/Requests.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/RequestBuilder.java b/src/main/java/org/elasticsearch/client/action/RequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/RequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/RequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java b/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java rename to src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/internal/InternalClient.java b/src/main/java/org/elasticsearch/client/internal/InternalClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/internal/InternalClient.java rename to src/main/java/org/elasticsearch/client/internal/InternalClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/internal/InternalClusterAdminClient.java b/src/main/java/org/elasticsearch/client/internal/InternalClusterAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/internal/InternalClusterAdminClient.java rename to src/main/java/org/elasticsearch/client/internal/InternalClusterAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/internal/InternalIndicesAdminClient.java b/src/main/java/org/elasticsearch/client/internal/InternalIndicesAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/internal/InternalIndicesAdminClient.java rename to src/main/java/org/elasticsearch/client/internal/InternalIndicesAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java b/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeAdminClient.java rename to src/main/java/org/elasticsearch/client/node/NodeAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClient.java b/src/main/java/org/elasticsearch/client/node/NodeClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClient.java rename to src/main/java/org/elasticsearch/client/node/NodeClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java b/src/main/java/org/elasticsearch/client/node/NodeClientModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClientModule.java rename to src/main/java/org/elasticsearch/client/node/NodeClientModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java b/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java rename to src/main/java/org/elasticsearch/client/node/NodeClusterAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java b/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java rename to src/main/java/org/elasticsearch/client/node/NodeIndicesAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/package-info.java b/src/main/java/org/elasticsearch/client/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/package-info.java rename to src/main/java/org/elasticsearch/client/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractClient.java rename to src/main/java/org/elasticsearch/client/support/AbstractClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java rename to src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java b/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java rename to src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java b/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java rename to src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java b/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java rename to src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/src/main/java/org/elasticsearch/client/transport/TransportClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClient.java rename to src/main/java/org/elasticsearch/client/transport/TransportClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java rename to src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportAction.java b/src/main/java/org/elasticsearch/client/transport/action/ClientTransportAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportAction.java rename to src/main/java/org/elasticsearch/client/transport/action/ClientTransportAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java b/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java rename to src/main/java/org/elasticsearch/client/transport/action/ClientTransportActionModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/health/ClientTransportClusterHealthAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/info/ClientTransportNodesInfoAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/restart/ClientTransportNodesRestartAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/shutdown/ClientTransportNodesShutdownAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/node/stats/ClientTransportNodesStatsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/broadcast/ClientTransportBroadcastPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/replication/ClientTransportReplicationPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/ping/single/ClientTransportSinglePingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/reroute/ClientTransportClusterRerouteAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/reroute/ClientTransportClusterRerouteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/reroute/ClientTransportClusterRerouteAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/reroute/ClientTransportClusterRerouteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/settings/ClientTransportClusterUpdateSettingsAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/settings/ClientTransportClusterUpdateSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/settings/ClientTransportClusterUpdateSettingsAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/settings/ClientTransportClusterUpdateSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/cluster/state/ClientTransportClusterStateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/alias/ClientTransportIndicesAliasesAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/analyze/ClientTransportAnalyzeAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/analyze/ClientTransportAnalyzeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/analyze/ClientTransportAnalyzeAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/analyze/ClientTransportAnalyzeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/cache/clear/ClientTransportClearIndicesCacheAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/close/ClientTransportCloseIndexAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/close/ClientTransportCloseIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/close/ClientTransportCloseIndexAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/close/ClientTransportCloseIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/create/ClientTransportCreateIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/delete/ClientTransportDeleteIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/exists/ClientTransportIndicesExistsAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/exists/ClientTransportIndicesExistsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/exists/ClientTransportIndicesExistsAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/exists/ClientTransportIndicesExistsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/flush/ClientTransportFlushAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/gateway/snapshot/ClientTransportGatewaySnapshotAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/delete/ClientTransportDeleteMappingAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/delete/ClientTransportDeleteMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/delete/ClientTransportDeleteMappingAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/delete/ClientTransportDeleteMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/put/ClientTransportPutMappingAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/put/ClientTransportPutMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/put/ClientTransportPutMappingAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/mapping/put/ClientTransportPutMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/open/ClientTransportOpenIndexAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/open/ClientTransportOpenIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/open/ClientTransportOpenIndexAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/open/ClientTransportOpenIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/optimize/ClientTransportOptimizeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/refresh/ClientTransportRefreshAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/segments/ClientTransportIndicesSegmentsAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/segments/ClientTransportIndicesSegmentsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/segments/ClientTransportIndicesSegmentsAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/segments/ClientTransportIndicesSegmentsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/settings/ClientTransportUpdateSettingsAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/settings/ClientTransportUpdateSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/settings/ClientTransportUpdateSettingsAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/settings/ClientTransportUpdateSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/stats/ClientTransportIndicesStatsAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/stats/ClientTransportIndicesStatsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/stats/ClientTransportIndicesStatsAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/stats/ClientTransportIndicesStatsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/status/ClientTransportIndicesStatusAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/delete/ClientTransportDeleteIndexTemplateAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/delete/ClientTransportDeleteIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/delete/ClientTransportDeleteIndexTemplateAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/delete/ClientTransportDeleteIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/put/ClientTransportPutIndexTemplateAction.java b/src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/put/ClientTransportPutIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/put/ClientTransportPutIndexTemplateAction.java rename to src/main/java/org/elasticsearch/client/transport/action/admin/indices/template/put/ClientTransportPutIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/bulk/ClientTransportBulkAction.java b/src/main/java/org/elasticsearch/client/transport/action/bulk/ClientTransportBulkAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/bulk/ClientTransportBulkAction.java rename to src/main/java/org/elasticsearch/client/transport/action/bulk/ClientTransportBulkAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java b/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java rename to src/main/java/org/elasticsearch/client/transport/action/count/ClientTransportCountAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java b/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java rename to src/main/java/org/elasticsearch/client/transport/action/delete/ClientTransportDeleteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java b/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java rename to src/main/java/org/elasticsearch/client/transport/action/deletebyquery/ClientTransportDeleteByQueryAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java b/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java rename to src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportMultiGetAction.java b/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportMultiGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportMultiGetAction.java rename to src/main/java/org/elasticsearch/client/transport/action/get/ClientTransportMultiGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java b/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java rename to src/main/java/org/elasticsearch/client/transport/action/index/ClientTransportIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java b/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java rename to src/main/java/org/elasticsearch/client/transport/action/mlt/ClientTransportMoreLikeThisAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/percolate/ClientTransportPercolateAction.java b/src/main/java/org/elasticsearch/client/transport/action/percolate/ClientTransportPercolateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/percolate/ClientTransportPercolateAction.java rename to src/main/java/org/elasticsearch/client/transport/action/percolate/ClientTransportPercolateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java b/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java rename to src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java b/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java rename to src/main/java/org/elasticsearch/client/transport/action/search/ClientTransportSearchScrollAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/support/BaseClientTransportAction.java b/src/main/java/org/elasticsearch/client/transport/action/support/BaseClientTransportAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/action/support/BaseClientTransportAction.java rename to src/main/java/org/elasticsearch/client/transport/action/support/BaseClientTransportAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java b/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java rename to src/main/java/org/elasticsearch/client/transport/support/InternalTransportAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java b/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java rename to src/main/java/org/elasticsearch/client/transport/support/InternalTransportClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java b/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java rename to src/main/java/org/elasticsearch/client/transport/support/InternalTransportClusterAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java b/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java rename to src/main/java/org/elasticsearch/client/transport/support/InternalTransportIndicesAdminClient.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java b/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java rename to src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java b/src/main/java/org/elasticsearch/cluster/ClusterModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterModule.java rename to src/main/java/org/elasticsearch/cluster/ClusterModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterName.java b/src/main/java/org/elasticsearch/cluster/ClusterName.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterName.java rename to src/main/java/org/elasticsearch/cluster/ClusterName.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java b/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java rename to src/main/java/org/elasticsearch/cluster/ClusterNameModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterService.java b/src/main/java/org/elasticsearch/cluster/ClusterService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterService.java rename to src/main/java/org/elasticsearch/cluster/ClusterService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterState.java b/src/main/java/org/elasticsearch/cluster/ClusterState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterState.java rename to src/main/java/org/elasticsearch/cluster/ClusterState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java b/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java rename to src/main/java/org/elasticsearch/cluster/ClusterStateListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java b/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java rename to src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java b/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java rename to src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java b/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java rename to src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java rename to src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeAliasesUpdatedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeAliasesUpdatedAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeAliasesUpdatedAction.java rename to src/main/java/org/elasticsearch/cluster/action/index/NodeAliasesUpdatedAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java rename to src/main/java/org/elasticsearch/cluster/action/index/NodeIndexCreatedAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java rename to src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java rename to src/main/java/org/elasticsearch/cluster/action/index/NodeMappingCreatedAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java rename to src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java rename to src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java b/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java rename to src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java b/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java rename to src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java b/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java rename to src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java b/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java rename to src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java rename to src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java rename to src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java rename to src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java rename to src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java rename to src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataStateIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataStateIndexService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataStateIndexService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataStateIndexService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java rename to src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java rename to src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java rename to src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java rename to src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java rename to src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java b/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java rename to src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java b/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java rename to src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java b/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java rename to src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java rename to src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java rename to src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java b/src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java rename to src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java b/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java rename to src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java b/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java rename to src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingBuilders.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingBuilders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingBuilders.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingBuilders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java rename to src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java b/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java rename to src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java rename to src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java b/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java rename to src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java b/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java rename to src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/EvenShardsCountAllocator.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/EvenShardsCountAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/EvenShardsCountAllocator.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/EvenShardsCountAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/GatewayAllocator.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/GatewayAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/GatewayAllocator.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/GatewayAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java rename to src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/OperationRouting.java b/src/main/java/org/elasticsearch/cluster/routing/operation/OperationRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/OperationRouting.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/OperationRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/OperationRoutingModule.java b/src/main/java/org/elasticsearch/cluster/routing/operation/OperationRoutingModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/OperationRoutingModule.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/OperationRoutingModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/hash/HashFunction.java b/src/main/java/org/elasticsearch/cluster/routing/operation/hash/HashFunction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/hash/HashFunction.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/hash/HashFunction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/hash/djb/DjbHashFunction.java b/src/main/java/org/elasticsearch/cluster/routing/operation/hash/djb/DjbHashFunction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/hash/djb/DjbHashFunction.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/hash/djb/DjbHashFunction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/hash/simple/SimpleHashFunction.java b/src/main/java/org/elasticsearch/cluster/routing/operation/hash/simple/SimpleHashFunction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/hash/simple/SimpleHashFunction.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/hash/simple/SimpleHashFunction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRouting.java b/src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRouting.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRoutingModule.java b/src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRoutingModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRoutingModule.java rename to src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRoutingModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java rename to src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Base64.java b/src/main/java/org/elasticsearch/common/Base64.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Base64.java rename to src/main/java/org/elasticsearch/common/Base64.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Booleans.java b/src/main/java/org/elasticsearch/common/Booleans.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Booleans.java rename to src/main/java/org/elasticsearch/common/Booleans.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Bytes.java b/src/main/java/org/elasticsearch/common/Bytes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Bytes.java rename to src/main/java/org/elasticsearch/common/Bytes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/BytesHolder.java b/src/main/java/org/elasticsearch/common/BytesHolder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/BytesHolder.java rename to src/main/java/org/elasticsearch/common/BytesHolder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/BytesWrap.java b/src/main/java/org/elasticsearch/common/BytesWrap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/BytesWrap.java rename to src/main/java/org/elasticsearch/common/BytesWrap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/CacheRecycler.java b/src/main/java/org/elasticsearch/common/CacheRecycler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/CacheRecycler.java rename to src/main/java/org/elasticsearch/common/CacheRecycler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Classes.java b/src/main/java/org/elasticsearch/common/Classes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Classes.java rename to src/main/java/org/elasticsearch/common/Classes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Digest.java b/src/main/java/org/elasticsearch/common/Digest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Digest.java rename to src/main/java/org/elasticsearch/common/Digest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Hex.java b/src/main/java/org/elasticsearch/common/Hex.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Hex.java rename to src/main/java/org/elasticsearch/common/Hex.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Names.java b/src/main/java/org/elasticsearch/common/Names.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Names.java rename to src/main/java/org/elasticsearch/common/Names.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Nullable.java b/src/main/java/org/elasticsearch/common/Nullable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Nullable.java rename to src/main/java/org/elasticsearch/common/Nullable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Numbers.java b/src/main/java/org/elasticsearch/common/Numbers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Numbers.java rename to src/main/java/org/elasticsearch/common/Numbers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Preconditions.java b/src/main/java/org/elasticsearch/common/Preconditions.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Preconditions.java rename to src/main/java/org/elasticsearch/common/Preconditions.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/RamUsage.java b/src/main/java/org/elasticsearch/common/RamUsage.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/RamUsage.java rename to src/main/java/org/elasticsearch/common/RamUsage.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/RandomStringGenerator.java b/src/main/java/org/elasticsearch/common/RandomStringGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/RandomStringGenerator.java rename to src/main/java/org/elasticsearch/common/RandomStringGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/RateLimiter.java b/src/main/java/org/elasticsearch/common/RateLimiter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/RateLimiter.java rename to src/main/java/org/elasticsearch/common/RateLimiter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Required.java b/src/main/java/org/elasticsearch/common/Required.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Required.java rename to src/main/java/org/elasticsearch/common/Required.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/StopWatch.java b/src/main/java/org/elasticsearch/common/StopWatch.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/StopWatch.java rename to src/main/java/org/elasticsearch/common/StopWatch.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Strings.java b/src/main/java/org/elasticsearch/common/Strings.java similarity index 99% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Strings.java rename to src/main/java/org/elasticsearch/common/Strings.java index 8c80868c94b..85dd0988325 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Strings.java +++ b/src/main/java/org/elasticsearch/common/Strings.java @@ -36,7 +36,7 @@ public class Strings { private static final String WINDOWS_FOLDER_SEPARATOR = "\\"; - private static final String TOP_PATH = ".."; + private static final String TOP_PATH = "src/test"; private static final String CURRENT_PATH = "."; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/UUID.java b/src/main/java/org/elasticsearch/common/UUID.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/UUID.java rename to src/main/java/org/elasticsearch/common/UUID.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/Unicode.java b/src/main/java/org/elasticsearch/common/Unicode.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/Unicode.java rename to src/main/java/org/elasticsearch/common/Unicode.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java b/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java rename to src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java b/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java rename to src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java b/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java rename to src/main/java/org/elasticsearch/common/blobstore/BlobPath.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java b/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java rename to src/main/java/org/elasticsearch/common/blobstore/BlobStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java b/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java rename to src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/ImmutableBlobContainer.java b/src/main/java/org/elasticsearch/common/blobstore/ImmutableBlobContainer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/ImmutableBlobContainer.java rename to src/main/java/org/elasticsearch/common/blobstore/ImmutableBlobContainer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/fs/AbstractFsBlobContainer.java b/src/main/java/org/elasticsearch/common/blobstore/fs/AbstractFsBlobContainer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/fs/AbstractFsBlobContainer.java rename to src/main/java/org/elasticsearch/common/blobstore/fs/AbstractFsBlobContainer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java b/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java rename to src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/fs/FsImmutableBlobContainer.java b/src/main/java/org/elasticsearch/common/blobstore/fs/FsImmutableBlobContainer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/fs/FsImmutableBlobContainer.java rename to src/main/java/org/elasticsearch/common/blobstore/fs/FsImmutableBlobContainer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java b/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java rename to src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/support/BlobStores.java b/src/main/java/org/elasticsearch/common/blobstore/support/BlobStores.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/support/BlobStores.java rename to src/main/java/org/elasticsearch/common/blobstore/support/BlobStores.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java b/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java rename to src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/BloomCalculations.java b/src/main/java/org/elasticsearch/common/bloom/BloomCalculations.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/BloomCalculations.java rename to src/main/java/org/elasticsearch/common/bloom/BloomCalculations.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/BloomFilter.java b/src/main/java/org/elasticsearch/common/bloom/BloomFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/BloomFilter.java rename to src/main/java/org/elasticsearch/common/bloom/BloomFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/BloomFilterFactory.java b/src/main/java/org/elasticsearch/common/bloom/BloomFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/BloomFilterFactory.java rename to src/main/java/org/elasticsearch/common/bloom/BloomFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/MurmurHash.java b/src/main/java/org/elasticsearch/common/bloom/MurmurHash.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/MurmurHash.java rename to src/main/java/org/elasticsearch/common/bloom/MurmurHash.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/ObsBloomFilter.java b/src/main/java/org/elasticsearch/common/bloom/ObsBloomFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/bloom/ObsBloomFilter.java rename to src/main/java/org/elasticsearch/common/bloom/ObsBloomFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/BoundedArrayList.java b/src/main/java/org/elasticsearch/common/collect/BoundedArrayList.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/BoundedArrayList.java rename to src/main/java/org/elasticsearch/common/collect/BoundedArrayList.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java b/src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java rename to src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java b/src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java rename to src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/MapBackedSet.java b/src/main/java/org/elasticsearch/common/collect/MapBackedSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/MapBackedSet.java rename to src/main/java/org/elasticsearch/common/collect/MapBackedSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/MapBuilder.java b/src/main/java/org/elasticsearch/common/collect/MapBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/MapBuilder.java rename to src/main/java/org/elasticsearch/common/collect/MapBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/ReusableIterator.java b/src/main/java/org/elasticsearch/common/collect/ReusableIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/ReusableIterator.java rename to src/main/java/org/elasticsearch/common/collect/ReusableIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/SafeArray.java b/src/main/java/org/elasticsearch/common/collect/SafeArray.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/SafeArray.java rename to src/main/java/org/elasticsearch/common/collect/SafeArray.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/Tuple.java b/src/main/java/org/elasticsearch/common/collect/Tuple.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/collect/Tuple.java rename to src/main/java/org/elasticsearch/common/collect/Tuple.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/component/AbstractComponent.java b/src/main/java/org/elasticsearch/common/component/AbstractComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/component/AbstractComponent.java rename to src/main/java/org/elasticsearch/common/component/AbstractComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java rename to src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/component/CloseableComponent.java b/src/main/java/org/elasticsearch/common/component/CloseableComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/component/CloseableComponent.java rename to src/main/java/org/elasticsearch/common/component/CloseableComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/component/Lifecycle.java b/src/main/java/org/elasticsearch/common/component/Lifecycle.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/component/Lifecycle.java rename to src/main/java/org/elasticsearch/common/component/Lifecycle.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java b/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java rename to src/main/java/org/elasticsearch/common/component/LifecycleComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/component/LifecycleListener.java b/src/main/java/org/elasticsearch/common/component/LifecycleListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/component/LifecycleListener.java rename to src/main/java/org/elasticsearch/common/component/LifecycleListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/CompressedString.java b/src/main/java/org/elasticsearch/common/compress/CompressedString.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/CompressedString.java rename to src/main/java/org/elasticsearch/common/compress/CompressedString.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/BZip2Constants.java b/src/main/java/org/elasticsearch/common/compress/bzip2/BZip2Constants.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/BZip2Constants.java rename to src/main/java/org/elasticsearch/common/compress/bzip2/BZip2Constants.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2InputStream.java b/src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2InputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2InputStream.java rename to src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2InputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2OutputStream.java b/src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2OutputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2OutputStream.java rename to src/main/java/org/elasticsearch/common/compress/bzip2/CBZip2OutputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/CRC.java b/src/main/java/org/elasticsearch/common/compress/bzip2/CRC.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/bzip2/CRC.java rename to src/main/java/org/elasticsearch/common/compress/bzip2/CRC.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/BufferRecycler.java b/src/main/java/org/elasticsearch/common/compress/lzf/BufferRecycler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/BufferRecycler.java rename to src/main/java/org/elasticsearch/common/compress/lzf/BufferRecycler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/ChunkDecoder.java b/src/main/java/org/elasticsearch/common/compress/lzf/ChunkDecoder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/ChunkDecoder.java rename to src/main/java/org/elasticsearch/common/compress/lzf/ChunkDecoder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/ChunkEncoder.java b/src/main/java/org/elasticsearch/common/compress/lzf/ChunkEncoder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/ChunkEncoder.java rename to src/main/java/org/elasticsearch/common/compress/lzf/ChunkEncoder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZF.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZF.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZF.java rename to src/main/java/org/elasticsearch/common/compress/lzf/LZF.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFChunk.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFChunk.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFChunk.java rename to src/main/java/org/elasticsearch/common/compress/lzf/LZFChunk.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFDecoder.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFDecoder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFDecoder.java rename to src/main/java/org/elasticsearch/common/compress/lzf/LZFDecoder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFEncoder.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFEncoder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFEncoder.java rename to src/main/java/org/elasticsearch/common/compress/lzf/LZFEncoder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/impl/UnsafeChunkDecoder.java b/src/main/java/org/elasticsearch/common/compress/lzf/impl/UnsafeChunkDecoder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/impl/UnsafeChunkDecoder.java rename to src/main/java/org/elasticsearch/common/compress/lzf/impl/UnsafeChunkDecoder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/impl/VanillaChunkDecoder.java b/src/main/java/org/elasticsearch/common/compress/lzf/impl/VanillaChunkDecoder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/impl/VanillaChunkDecoder.java rename to src/main/java/org/elasticsearch/common/compress/lzf/impl/VanillaChunkDecoder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/package-info.java b/src/main/java/org/elasticsearch/common/compress/lzf/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/package-info.java rename to src/main/java/org/elasticsearch/common/compress/lzf/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/util/ChunkDecoderFactory.java b/src/main/java/org/elasticsearch/common/compress/lzf/util/ChunkDecoderFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/util/ChunkDecoderFactory.java rename to src/main/java/org/elasticsearch/common/compress/lzf/util/ChunkDecoderFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java b/src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java rename to src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/AbstractModule.java b/src/main/java/org/elasticsearch/common/inject/AbstractModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/AbstractModule.java rename to src/main/java/org/elasticsearch/common/inject/AbstractModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java b/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java rename to src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Binder.java b/src/main/java/org/elasticsearch/common/inject/Binder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Binder.java rename to src/main/java/org/elasticsearch/common/inject/Binder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Binding.java b/src/main/java/org/elasticsearch/common/inject/Binding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Binding.java rename to src/main/java/org/elasticsearch/common/inject/Binding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java b/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java rename to src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java b/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java rename to src/main/java/org/elasticsearch/common/inject/BindingProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java b/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java rename to src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java b/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java rename to src/main/java/org/elasticsearch/common/inject/ConfigurationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java b/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java rename to src/main/java/org/elasticsearch/common/inject/ConstantFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java b/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java rename to src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java b/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java rename to src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java b/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java rename to src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java b/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java rename to src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java b/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java rename to src/main/java/org/elasticsearch/common/inject/ContextualCallable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/CreationException.java b/src/main/java/org/elasticsearch/common/inject/CreationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/CreationException.java rename to src/main/java/org/elasticsearch/common/inject/CreationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java b/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java rename to src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java b/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java rename to src/main/java/org/elasticsearch/common/inject/DeferredLookups.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java b/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java rename to src/main/java/org/elasticsearch/common/inject/EncounterImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Exposed.java b/src/main/java/org/elasticsearch/common/inject/Exposed.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Exposed.java rename to src/main/java/org/elasticsearch/common/inject/Exposed.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java b/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java rename to src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java b/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java rename to src/main/java/org/elasticsearch/common/inject/FactoryProxy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Guice.java b/src/main/java/org/elasticsearch/common/inject/Guice.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Guice.java rename to src/main/java/org/elasticsearch/common/inject/Guice.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java b/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java rename to src/main/java/org/elasticsearch/common/inject/ImplementedBy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InheritingState.java b/src/main/java/org/elasticsearch/common/inject/InheritingState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InheritingState.java rename to src/main/java/org/elasticsearch/common/inject/InheritingState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Initializable.java b/src/main/java/org/elasticsearch/common/inject/Initializable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Initializable.java rename to src/main/java/org/elasticsearch/common/inject/Initializable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Initializables.java b/src/main/java/org/elasticsearch/common/inject/Initializables.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Initializables.java rename to src/main/java/org/elasticsearch/common/inject/Initializables.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Initializer.java b/src/main/java/org/elasticsearch/common/inject/Initializer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Initializer.java rename to src/main/java/org/elasticsearch/common/inject/Initializer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Inject.java b/src/main/java/org/elasticsearch/common/inject/Inject.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Inject.java rename to src/main/java/org/elasticsearch/common/inject/Inject.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java b/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java rename to src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Injector.java b/src/main/java/org/elasticsearch/common/inject/Injector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Injector.java rename to src/main/java/org/elasticsearch/common/inject/Injector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java b/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java rename to src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java b/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java rename to src/main/java/org/elasticsearch/common/inject/InjectorImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectorShell.java b/src/main/java/org/elasticsearch/common/inject/InjectorShell.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InjectorShell.java rename to src/main/java/org/elasticsearch/common/inject/InjectorShell.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Injectors.java b/src/main/java/org/elasticsearch/common/inject/Injectors.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Injectors.java rename to src/main/java/org/elasticsearch/common/inject/Injectors.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java b/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java rename to src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Key.java b/src/main/java/org/elasticsearch/common/inject/Key.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Key.java rename to src/main/java/org/elasticsearch/common/inject/Key.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java b/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java rename to src/main/java/org/elasticsearch/common/inject/LookupProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Lookups.java b/src/main/java/org/elasticsearch/common/inject/Lookups.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Lookups.java rename to src/main/java/org/elasticsearch/common/inject/Lookups.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MembersInjector.java b/src/main/java/org/elasticsearch/common/inject/MembersInjector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MembersInjector.java rename to src/main/java/org/elasticsearch/common/inject/MembersInjector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java b/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java rename to src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java b/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java rename to src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java b/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java rename to src/main/java/org/elasticsearch/common/inject/MessageProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Module.java b/src/main/java/org/elasticsearch/common/inject/Module.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Module.java rename to src/main/java/org/elasticsearch/common/inject/Module.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Modules.java b/src/main/java/org/elasticsearch/common/inject/Modules.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Modules.java rename to src/main/java/org/elasticsearch/common/inject/Modules.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java b/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java rename to src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java b/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java rename to src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java b/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java rename to src/main/java/org/elasticsearch/common/inject/PreProcessModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java b/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java rename to src/main/java/org/elasticsearch/common/inject/PrivateBinder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java b/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java rename to src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PrivateModule.java b/src/main/java/org/elasticsearch/common/inject/PrivateModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/PrivateModule.java rename to src/main/java/org/elasticsearch/common/inject/PrivateModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java b/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java rename to src/main/java/org/elasticsearch/common/inject/ProvidedBy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Provider.java b/src/main/java/org/elasticsearch/common/inject/Provider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Provider.java rename to src/main/java/org/elasticsearch/common/inject/Provider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java b/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java rename to src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Provides.java b/src/main/java/org/elasticsearch/common/inject/Provides.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Provides.java rename to src/main/java/org/elasticsearch/common/inject/Provides.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ProvisionException.java b/src/main/java/org/elasticsearch/common/inject/ProvisionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ProvisionException.java rename to src/main/java/org/elasticsearch/common/inject/ProvisionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Reflection.java b/src/main/java/org/elasticsearch/common/inject/Reflection.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Reflection.java rename to src/main/java/org/elasticsearch/common/inject/Reflection.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Scope.java b/src/main/java/org/elasticsearch/common/inject/Scope.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Scope.java rename to src/main/java/org/elasticsearch/common/inject/Scope.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java b/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java rename to src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java b/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java rename to src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Scopes.java b/src/main/java/org/elasticsearch/common/inject/Scopes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Scopes.java rename to src/main/java/org/elasticsearch/common/inject/Scopes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java b/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java rename to src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java b/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java rename to src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java b/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java rename to src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java b/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java rename to src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Singleton.java b/src/main/java/org/elasticsearch/common/inject/Singleton.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Singleton.java rename to src/main/java/org/elasticsearch/common/inject/Singleton.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SpawnModules.java b/src/main/java/org/elasticsearch/common/inject/SpawnModules.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/SpawnModules.java rename to src/main/java/org/elasticsearch/common/inject/SpawnModules.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Stage.java b/src/main/java/org/elasticsearch/common/inject/Stage.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/Stage.java rename to src/main/java/org/elasticsearch/common/inject/Stage.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/State.java b/src/main/java/org/elasticsearch/common/inject/State.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/State.java rename to src/main/java/org/elasticsearch/common/inject/State.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java b/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java rename to src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java b/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java rename to src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java b/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java rename to src/main/java/org/elasticsearch/common/inject/TypeLiteral.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java b/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java rename to src/main/java/org/elasticsearch/common/inject/WeakKeySet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java b/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java rename to src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java b/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java rename to src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/package-info.java b/src/main/java/org/elasticsearch/common/inject/binder/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/binder/package-info.java rename to src/main/java/org/elasticsearch/common/inject/binder/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java b/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java rename to src/main/java/org/elasticsearch/common/inject/internal/Annotations.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java b/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java rename to src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java b/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java rename to src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BytecodeGen.java b/src/main/java/org/elasticsearch/common/inject/internal/BytecodeGen.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/BytecodeGen.java rename to src/main/java/org/elasticsearch/common/inject/internal/BytecodeGen.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Classes.java b/src/main/java/org/elasticsearch/common/inject/internal/Classes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Classes.java rename to src/main/java/org/elasticsearch/common/inject/internal/Classes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java b/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java rename to src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java b/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java rename to src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java b/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java rename to src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Errors.java b/src/main/java/org/elasticsearch/common/inject/internal/Errors.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Errors.java rename to src/main/java/org/elasticsearch/common/inject/internal/Errors.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java b/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java rename to src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java b/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java rename to src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java b/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java rename to src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java b/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java rename to src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java b/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java rename to src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java b/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java rename to src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Join.java b/src/main/java/org/elasticsearch/common/inject/internal/Join.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Join.java rename to src/main/java/org/elasticsearch/common/inject/internal/Join.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java b/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java rename to src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java b/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java rename to src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java b/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java rename to src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java b/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java rename to src/main/java/org/elasticsearch/common/inject/internal/Nullability.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java b/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java rename to src/main/java/org/elasticsearch/common/inject/internal/Nullable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Objects.java b/src/main/java/org/elasticsearch/common/inject/internal/Objects.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Objects.java rename to src/main/java/org/elasticsearch/common/inject/internal/Objects.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java b/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java rename to src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java b/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java rename to src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java b/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java rename to src/main/java/org/elasticsearch/common/inject/internal/Scoping.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java b/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java rename to src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java b/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java rename to src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java b/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java rename to src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Strings.java b/src/main/java/org/elasticsearch/common/inject/internal/Strings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/Strings.java rename to src/main/java/org/elasticsearch/common/inject/internal/Strings.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java b/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java rename to src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java b/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java rename to src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/UnmodifiableIterator.java b/src/main/java/org/elasticsearch/common/inject/internal/UnmodifiableIterator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/UnmodifiableIterator.java rename to src/main/java/org/elasticsearch/common/inject/internal/UnmodifiableIterator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java b/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java rename to src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/package-info.java b/src/main/java/org/elasticsearch/common/inject/internal/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/internal/package-info.java rename to src/main/java/org/elasticsearch/common/inject/internal/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java b/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java rename to src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java b/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java rename to src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java b/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java rename to src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java b/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java rename to src/main/java/org/elasticsearch/common/inject/matcher/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java b/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java rename to src/main/java/org/elasticsearch/common/inject/multibindings/Element.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java b/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java rename to src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java b/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java rename to src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java b/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java rename to src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java b/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java rename to src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/Named.java b/src/main/java/org/elasticsearch/common/inject/name/Named.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/Named.java rename to src/main/java/org/elasticsearch/common/inject/name/Named.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java b/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java rename to src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/Names.java b/src/main/java/org/elasticsearch/common/inject/name/Names.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/Names.java rename to src/main/java/org/elasticsearch/common/inject/name/Names.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/package-info.java b/src/main/java/org/elasticsearch/common/inject/name/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/name/package-info.java rename to src/main/java/org/elasticsearch/common/inject/name/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/package-info.java b/src/main/java/org/elasticsearch/common/inject/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/package-info.java rename to src/main/java/org/elasticsearch/common/inject/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java b/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java rename to src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java b/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java rename to src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java b/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java rename to src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java b/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java rename to src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java b/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java rename to src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java b/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java rename to src/main/java/org/elasticsearch/common/inject/spi/Dependency.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Element.java b/src/main/java/org/elasticsearch/common/inject/spi/Element.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Element.java rename to src/main/java/org/elasticsearch/common/inject/spi/Element.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java b/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java rename to src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Elements.java b/src/main/java/org/elasticsearch/common/inject/spi/Elements.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Elements.java rename to src/main/java/org/elasticsearch/common/inject/spi/Elements.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java b/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java rename to src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java b/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java rename to src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java b/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java rename to src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java b/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java rename to src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java b/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java rename to src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Message.java b/src/main/java/org/elasticsearch/common/inject/spi/Message.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/Message.java rename to src/main/java/org/elasticsearch/common/inject/spi/Message.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java b/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java rename to src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java b/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java rename to src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java b/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java rename to src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java b/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java rename to src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java b/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java rename to src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java b/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java rename to src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java b/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java rename to src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java b/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java rename to src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/package-info.java b/src/main/java/org/elasticsearch/common/inject/spi/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/spi/package-info.java rename to src/main/java/org/elasticsearch/common/inject/spi/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/Modules.java b/src/main/java/org/elasticsearch/common/inject/util/Modules.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/Modules.java rename to src/main/java/org/elasticsearch/common/inject/util/Modules.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/Providers.java b/src/main/java/org/elasticsearch/common/inject/util/Providers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/Providers.java rename to src/main/java/org/elasticsearch/common/inject/util/Providers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/Types.java b/src/main/java/org/elasticsearch/common/inject/util/Types.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/Types.java rename to src/main/java/org/elasticsearch/common/inject/util/Types.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/package-info.java b/src/main/java/org/elasticsearch/common/inject/util/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/inject/util/package-info.java rename to src/main/java/org/elasticsearch/common/inject/util/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/BooleanStreamable.java b/src/main/java/org/elasticsearch/common/io/BooleanStreamable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/BooleanStreamable.java rename to src/main/java/org/elasticsearch/common/io/BooleanStreamable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/BytesStream.java b/src/main/java/org/elasticsearch/common/io/BytesStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/BytesStream.java rename to src/main/java/org/elasticsearch/common/io/BytesStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CachedStreams.java b/src/main/java/org/elasticsearch/common/io/CachedStreams.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CachedStreams.java rename to src/main/java/org/elasticsearch/common/io/CachedStreams.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CharSequenceReader.java b/src/main/java/org/elasticsearch/common/io/CharSequenceReader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CharSequenceReader.java rename to src/main/java/org/elasticsearch/common/io/CharSequenceReader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CompactObjectInputStream.java b/src/main/java/org/elasticsearch/common/io/CompactObjectInputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CompactObjectInputStream.java rename to src/main/java/org/elasticsearch/common/io/CompactObjectInputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CompactObjectOutputStream.java b/src/main/java/org/elasticsearch/common/io/CompactObjectOutputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/CompactObjectOutputStream.java rename to src/main/java/org/elasticsearch/common/io/CompactObjectOutputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastByteArrayInputStream.java b/src/main/java/org/elasticsearch/common/io/FastByteArrayInputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastByteArrayInputStream.java rename to src/main/java/org/elasticsearch/common/io/FastByteArrayInputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastByteArrayOutputStream.java b/src/main/java/org/elasticsearch/common/io/FastByteArrayOutputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastByteArrayOutputStream.java rename to src/main/java/org/elasticsearch/common/io/FastByteArrayOutputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java b/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java rename to src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java b/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java rename to src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastStringReader.java b/src/main/java/org/elasticsearch/common/io/FastStringReader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FastStringReader.java rename to src/main/java/org/elasticsearch/common/io/FastStringReader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FileChannelInputStream.java b/src/main/java/org/elasticsearch/common/io/FileChannelInputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FileChannelInputStream.java rename to src/main/java/org/elasticsearch/common/io/FileChannelInputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java b/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java rename to src/main/java/org/elasticsearch/common/io/FileSystemUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/Serializers.java b/src/main/java/org/elasticsearch/common/io/Serializers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/Serializers.java rename to src/main/java/org/elasticsearch/common/io/Serializers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/Streams.java b/src/main/java/org/elasticsearch/common/io/Streams.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/Streams.java rename to src/main/java/org/elasticsearch/common/io/Streams.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java b/src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java rename to src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java b/src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java rename to src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/BytesStreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/BytesStreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/BytesStreamInput.java rename to src/main/java/org/elasticsearch/common/io/stream/BytesStreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java b/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java rename to src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/CachedStreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/CachedStreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/CachedStreamInput.java rename to src/main/java/org/elasticsearch/common/io/stream/CachedStreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/CachedStreamOutput.java b/src/main/java/org/elasticsearch/common/io/stream/CachedStreamOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/CachedStreamOutput.java rename to src/main/java/org/elasticsearch/common/io/stream/CachedStreamOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java b/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java rename to src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/HandlesStreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/HandlesStreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/HandlesStreamInput.java rename to src/main/java/org/elasticsearch/common/io/stream/HandlesStreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/HandlesStreamOutput.java b/src/main/java/org/elasticsearch/common/io/stream/HandlesStreamOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/HandlesStreamOutput.java rename to src/main/java/org/elasticsearch/common/io/stream/HandlesStreamOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java rename to src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/LZFStreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamInput.java rename to src/main/java/org/elasticsearch/common/io/stream/LZFStreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java b/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java rename to src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LongStreamable.java b/src/main/java/org/elasticsearch/common/io/stream/LongStreamable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LongStreamable.java rename to src/main/java/org/elasticsearch/common/io/stream/LongStreamable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java rename to src/main/java/org/elasticsearch/common/io/stream/StreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java rename to src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/Streamable.java b/src/main/java/org/elasticsearch/common/io/stream/Streamable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/Streamable.java rename to src/main/java/org/elasticsearch/common/io/stream/Streamable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/Streamables.java b/src/main/java/org/elasticsearch/common/io/stream/Streamables.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/Streamables.java rename to src/main/java/org/elasticsearch/common/io/stream/Streamables.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/StringStreamable.java b/src/main/java/org/elasticsearch/common/io/stream/StringStreamable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/StringStreamable.java rename to src/main/java/org/elasticsearch/common/io/stream/StringStreamable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/VoidStreamable.java b/src/main/java/org/elasticsearch/common/io/stream/VoidStreamable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/VoidStreamable.java rename to src/main/java/org/elasticsearch/common/io/stream/VoidStreamable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/jline/ANSI.java b/src/main/java/org/elasticsearch/common/jline/ANSI.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/jline/ANSI.java rename to src/main/java/org/elasticsearch/common/jline/ANSI.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/jna/CLibrary.java b/src/main/java/org/elasticsearch/common/jna/CLibrary.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/jna/CLibrary.java rename to src/main/java/org/elasticsearch/common/jna/CLibrary.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/jna/Natives.java b/src/main/java/org/elasticsearch/common/jna/Natives.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/jna/Natives.java rename to src/main/java/org/elasticsearch/common/jna/Natives.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java b/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java rename to src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/joda/Joda.java b/src/main/java/org/elasticsearch/common/joda/Joda.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/joda/Joda.java rename to src/main/java/org/elasticsearch/common/joda/Joda.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lab/LongsLAB.java b/src/main/java/org/elasticsearch/common/lab/LongsLAB.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lab/LongsLAB.java rename to src/main/java/org/elasticsearch/common/lab/LongsLAB.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lease/Releasable.java b/src/main/java/org/elasticsearch/common/lease/Releasable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lease/Releasable.java rename to src/main/java/org/elasticsearch/common/lease/Releasable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/ESLogger.java b/src/main/java/org/elasticsearch/common/logging/ESLogger.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/ESLogger.java rename to src/main/java/org/elasticsearch/common/logging/ESLogger.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java b/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java rename to src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/Loggers.java b/src/main/java/org/elasticsearch/common/logging/Loggers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/Loggers.java rename to src/main/java/org/elasticsearch/common/logging/Loggers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java b/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java rename to src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java b/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java rename to src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java b/src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java rename to src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/JLinePatternLayout.java b/src/main/java/org/elasticsearch/common/logging/log4j/JLinePatternLayout.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/JLinePatternLayout.java rename to src/main/java/org/elasticsearch/common/logging/log4j/JLinePatternLayout.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java b/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java rename to src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java b/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java rename to src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java b/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java rename to src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java b/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java rename to src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java b/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java rename to src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java b/src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java rename to src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java b/src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java rename to src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/Directories.java b/src/main/java/org/elasticsearch/common/lucene/Directories.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/Directories.java rename to src/main/java/org/elasticsearch/common/lucene/Directories.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/DocumentBuilder.java b/src/main/java/org/elasticsearch/common/lucene/DocumentBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/DocumentBuilder.java rename to src/main/java/org/elasticsearch/common/lucene/DocumentBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/FieldBuilder.java b/src/main/java/org/elasticsearch/common/lucene/FieldBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/FieldBuilder.java rename to src/main/java/org/elasticsearch/common/lucene/FieldBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java b/src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java rename to src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/IndexWriters.java b/src/main/java/org/elasticsearch/common/lucene/IndexWriters.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/IndexWriters.java rename to src/main/java/org/elasticsearch/common/lucene/IndexWriters.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java b/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java rename to src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/Lucene.java rename to src/main/java/org/elasticsearch/common/lucene/Lucene.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java b/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java rename to src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/MultiCollector.java b/src/main/java/org/elasticsearch/common/lucene/MultiCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/MultiCollector.java rename to src/main/java/org/elasticsearch/common/lucene/MultiCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/ReaderSearcherHolder.java b/src/main/java/org/elasticsearch/common/lucene/ReaderSearcherHolder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/ReaderSearcherHolder.java rename to src/main/java/org/elasticsearch/common/lucene/ReaderSearcherHolder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java b/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java rename to src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllField.java b/src/main/java/org/elasticsearch/common/lucene/all/AllField.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllField.java rename to src/main/java/org/elasticsearch/common/lucene/all/AllField.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java b/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java rename to src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java b/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java rename to src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/analysis/HTMLStripCharFilter.java b/src/main/java/org/elasticsearch/common/lucene/analysis/HTMLStripCharFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/analysis/HTMLStripCharFilter.java rename to src/main/java/org/elasticsearch/common/lucene/analysis/HTMLStripCharFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/AndDocIdSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSetCollector.java b/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSetCollector.java rename to src/main/java/org/elasticsearch/common/lucene/docset/DocIdSetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSets.java b/src/main/java/org/elasticsearch/common/lucene/docset/DocSets.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSets.java rename to src/main/java/org/elasticsearch/common/lucene/docset/DocSets.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocIdSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/NotDocIdSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocIdSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/NotDocIdSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocIdSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/OrDocIdSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocIdSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/OrDocIdSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java b/src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java rename to src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/document/ResetFieldSelector.java b/src/main/java/org/elasticsearch/common/lucene/document/ResetFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/document/ResetFieldSelector.java rename to src/main/java/org/elasticsearch/common/lucene/document/ResetFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/document/SingleFieldSelector.java b/src/main/java/org/elasticsearch/common/lucene/document/SingleFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/document/SingleFieldSelector.java rename to src/main/java/org/elasticsearch/common/lucene/document/SingleFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/AndFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/AndFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/AndFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/AndFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java b/src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java rename to src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java b/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java rename to src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsQuery.java b/src/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsQuery.java rename to src/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java b/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java rename to src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java b/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java rename to src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/NoCacheFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/NoCacheFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/NoCacheFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/NoCacheFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java b/src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java rename to src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/NotFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/NotFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/NotFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/NotFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/OrFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/OrFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/OrFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/OrFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/Queries.java b/src/main/java/org/elasticsearch/common/lucene/search/Queries.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/Queries.java rename to src/main/java/org/elasticsearch/common/lucene/search/Queries.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/TermFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/TermFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/TermFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/TermFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java b/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java rename to src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java b/src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java rename to src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java b/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java rename to src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java b/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java rename to src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java b/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java rename to src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java b/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java rename to src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/NullIndexOutput.java b/src/main/java/org/elasticsearch/common/lucene/store/NullIndexOutput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/NullIndexOutput.java rename to src/main/java/org/elasticsearch/common/lucene/store/NullIndexOutput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/SwitchDirectory.java b/src/main/java/org/elasticsearch/common/lucene/store/SwitchDirectory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/SwitchDirectory.java rename to src/main/java/org/elasticsearch/common/lucene/store/SwitchDirectory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java b/src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java rename to src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/uid/UidField.java b/src/main/java/org/elasticsearch/common/lucene/uid/UidField.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/uid/UidField.java rename to src/main/java/org/elasticsearch/common/lucene/uid/UidField.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMap.java b/src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMap.java rename to src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMapLong.java b/src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMapLong.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMapLong.java rename to src/main/java/org/elasticsearch/common/lucene/versioned/ConcurrentVersionedMapLong.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMap.java b/src/main/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMap.java rename to src/main/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReader.java b/src/main/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReader.java rename to src/main/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/VersionedMap.java b/src/main/java/org/elasticsearch/common/lucene/versioned/VersionedMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/versioned/VersionedMap.java rename to src/main/java/org/elasticsearch/common/lucene/versioned/VersionedMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/math/MathRuntimeException.java b/src/main/java/org/elasticsearch/common/math/MathRuntimeException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/math/MathRuntimeException.java rename to src/main/java/org/elasticsearch/common/math/MathRuntimeException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/math/MathUtils.java b/src/main/java/org/elasticsearch/common/math/MathUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/math/MathUtils.java rename to src/main/java/org/elasticsearch/common/math/MathUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java b/src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java rename to src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java b/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java rename to src/main/java/org/elasticsearch/common/metrics/CounterMetric.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/EWMA.java b/src/main/java/org/elasticsearch/common/metrics/EWMA.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/EWMA.java rename to src/main/java/org/elasticsearch/common/metrics/EWMA.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java b/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java rename to src/main/java/org/elasticsearch/common/metrics/MeanMetric.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java b/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java rename to src/main/java/org/elasticsearch/common/metrics/MeterMetric.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/Metric.java b/src/main/java/org/elasticsearch/common/metrics/Metric.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/metrics/Metric.java rename to src/main/java/org/elasticsearch/common/metrics/Metric.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java b/src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java rename to src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkModule.java b/src/main/java/org/elasticsearch/common/network/NetworkModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkModule.java rename to src/main/java/org/elasticsearch/common/network/NetworkModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkService.java b/src/main/java/org/elasticsearch/common/network/NetworkService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkService.java rename to src/main/java/org/elasticsearch/common/network/NetworkService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkUtils.java b/src/main/java/org/elasticsearch/common/network/NetworkUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkUtils.java rename to src/main/java/org/elasticsearch/common/network/NetworkUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/os/OsUtils.java b/src/main/java/org/elasticsearch/common/os/OsUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/os/OsUtils.java rename to src/main/java/org/elasticsearch/common/os/OsUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/path/PathTrie.java b/src/main/java/org/elasticsearch/common/path/PathTrie.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/path/PathTrie.java rename to src/main/java/org/elasticsearch/common/path/PathTrie.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java b/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java rename to src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/regex/Regex.java b/src/main/java/org/elasticsearch/common/regex/Regex.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/regex/Regex.java rename to src/main/java/org/elasticsearch/common/regex/Regex.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java b/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java rename to src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java b/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java rename to src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/Settings.java b/src/main/java/org/elasticsearch/common/settings/Settings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/Settings.java rename to src/main/java/org/elasticsearch/common/settings/Settings.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/SettingsException.java b/src/main/java/org/elasticsearch/common/settings/SettingsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/SettingsException.java rename to src/main/java/org/elasticsearch/common/settings/SettingsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java b/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java rename to src/main/java/org/elasticsearch/common/settings/SettingsFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/SettingsModule.java b/src/main/java/org/elasticsearch/common/settings/SettingsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/SettingsModule.java rename to src/main/java/org/elasticsearch/common/settings/SettingsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java b/src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java rename to src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java b/src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java rename to src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java b/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java rename to src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java b/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java rename to src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java b/src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java rename to src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/package-info.java b/src/main/java/org/elasticsearch/common/settings/loader/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/loader/package-info.java rename to src/main/java/org/elasticsearch/common/settings/loader/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/package-info.java b/src/main/java/org/elasticsearch/common/settings/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/package-info.java rename to src/main/java/org/elasticsearch/common/settings/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/LoggingRunnable.java b/src/main/java/org/elasticsearch/common/thread/LoggingRunnable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/LoggingRunnable.java rename to src/main/java/org/elasticsearch/common/thread/LoggingRunnable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/ThreadLocals.java b/src/main/java/org/elasticsearch/common/thread/ThreadLocals.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/ThreadLocals.java rename to src/main/java/org/elasticsearch/common/thread/ThreadLocals.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java b/src/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java rename to src/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java b/src/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java rename to src/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/HashedWheelTimer.java b/src/main/java/org/elasticsearch/common/timer/HashedWheelTimer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/HashedWheelTimer.java rename to src/main/java/org/elasticsearch/common/timer/HashedWheelTimer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/Timeout.java b/src/main/java/org/elasticsearch/common/timer/Timeout.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/Timeout.java rename to src/main/java/org/elasticsearch/common/timer/Timeout.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/Timer.java b/src/main/java/org/elasticsearch/common/timer/Timer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/Timer.java rename to src/main/java/org/elasticsearch/common/timer/Timer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/TimerTask.java b/src/main/java/org/elasticsearch/common/timer/TimerTask.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/timer/TimerTask.java rename to src/main/java/org/elasticsearch/common/timer/TimerTask.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java b/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java rename to src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java b/src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java rename to src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java b/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java rename to src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java b/src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java rename to src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java b/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java rename to src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/PortsRange.java b/src/main/java/org/elasticsearch/common/transport/PortsRange.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/PortsRange.java rename to src/main/java/org/elasticsearch/common/transport/PortsRange.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/TransportAddress.java b/src/main/java/org/elasticsearch/common/transport/TransportAddress.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/TransportAddress.java rename to src/main/java/org/elasticsearch/common/transport/TransportAddress.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java b/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java rename to src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTDoubleObjectHashMap.java b/src/main/java/org/elasticsearch/common/trove/ExtTDoubleObjectHashMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTDoubleObjectHashMap.java rename to src/main/java/org/elasticsearch/common/trove/ExtTDoubleObjectHashMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTHashMap.java b/src/main/java/org/elasticsearch/common/trove/ExtTHashMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTHashMap.java rename to src/main/java/org/elasticsearch/common/trove/ExtTHashMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTIntArrayList.java b/src/main/java/org/elasticsearch/common/trove/ExtTIntArrayList.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTIntArrayList.java rename to src/main/java/org/elasticsearch/common/trove/ExtTIntArrayList.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTLongObjectHashMap.java b/src/main/java/org/elasticsearch/common/trove/ExtTLongObjectHashMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTLongObjectHashMap.java rename to src/main/java/org/elasticsearch/common/trove/ExtTLongObjectHashMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTObjectIntHasMap.java b/src/main/java/org/elasticsearch/common/trove/ExtTObjectIntHasMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/ExtTObjectIntHasMap.java rename to src/main/java/org/elasticsearch/common/trove/ExtTObjectIntHasMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/StringIdentityHashingStrategy.java b/src/main/java/org/elasticsearch/common/trove/StringIdentityHashingStrategy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/trove/StringIdentityHashingStrategy.java rename to src/main/java/org/elasticsearch/common/trove/StringIdentityHashingStrategy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java b/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java rename to src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java rename to src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java rename to src/main/java/org/elasticsearch/common/unit/DistanceUnit.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/Percent.java b/src/main/java/org/elasticsearch/common/unit/Percent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/Percent.java rename to src/main/java/org/elasticsearch/common/unit/Percent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/SizeUnit.java b/src/main/java/org/elasticsearch/common/unit/SizeUnit.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/SizeUnit.java rename to src/main/java/org/elasticsearch/common/unit/SizeUnit.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/SizeValue.java b/src/main/java/org/elasticsearch/common/unit/SizeValue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/SizeValue.java rename to src/main/java/org/elasticsearch/common/unit/SizeValue.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/TimeValue.java b/src/main/java/org/elasticsearch/common/unit/TimeValue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/unit/TimeValue.java rename to src/main/java/org/elasticsearch/common/unit/TimeValue.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java b/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java b/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentIdentityHashMap.java b/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentIdentityHashMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentIdentityHashMap.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentIdentityHashMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java b/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentSafeArray.java b/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentSafeArray.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentSafeArray.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentSafeArray.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/CopyOnWriteMap.java b/src/main/java/org/elasticsearch/common/util/concurrent/CopyOnWriteMap.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/CopyOnWriteMap.java rename to src/main/java/org/elasticsearch/common/util/concurrent/CopyOnWriteMap.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/DynamicExecutors.java b/src/main/java/org/elasticsearch/common/util/concurrent/DynamicExecutors.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/DynamicExecutors.java rename to src/main/java/org/elasticsearch/common/util/concurrent/DynamicExecutors.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/DynamicThreadPoolExecutor.java b/src/main/java/org/elasticsearch/common/util/concurrent/DynamicThreadPoolExecutor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/DynamicThreadPoolExecutor.java rename to src/main/java/org/elasticsearch/common/util/concurrent/DynamicThreadPoolExecutor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java rename to src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/Immutable.java b/src/main/java/org/elasticsearch/common/util/concurrent/Immutable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/Immutable.java rename to src/main/java/org/elasticsearch/common/util/concurrent/Immutable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/NotThreadSafe.java b/src/main/java/org/elasticsearch/common/util/concurrent/NotThreadSafe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/NotThreadSafe.java rename to src/main/java/org/elasticsearch/common/util/concurrent/NotThreadSafe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java b/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ThreadSafe.java b/src/main/java/org/elasticsearch/common/util/concurrent/ThreadSafe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/ThreadSafe.java rename to src/main/java/org/elasticsearch/common/util/concurrent/ThreadSafe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/TransferThreadPoolExecutor.java b/src/main/java/org/elasticsearch/common/util/concurrent/TransferThreadPoolExecutor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/TransferThreadPoolExecutor.java rename to src/main/java/org/elasticsearch/common/util/concurrent/TransferThreadPoolExecutor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java b/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java rename to src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResource.java b/src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResource.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResource.java rename to src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResource.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResourceFactory.java b/src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResourceFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResourceFactory.java rename to src/main/java/org/elasticsearch/common/util/concurrent/resource/AcquirableResourceFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResource.java b/src/main/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResource.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResource.java rename to src/main/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResource.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResource.java b/src/main/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResource.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResource.java rename to src/main/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResource.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java b/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java rename to src/main/java/org/elasticsearch/common/xcontent/ToXContent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContent.java b/src/main/java/org/elasticsearch/common/xcontent/XContent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContent.java rename to src/main/java/org/elasticsearch/common/xcontent/XContent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java b/src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentString.java b/src/main/java/org/elasticsearch/common/xcontent/XContentString.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentString.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentString.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentType.java b/src/main/java/org/elasticsearch/common/xcontent/XContentType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentType.java rename to src/main/java/org/elasticsearch/common/xcontent/XContentType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java rename to src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java rename to src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java rename to src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java rename to src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java rename to src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java rename to src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java rename to src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java rename to src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapConverter.java b/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapConverter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapConverter.java rename to src/main/java/org/elasticsearch/common/xcontent/support/XContentMapConverter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java b/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java rename to src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/Discovery.java b/src/main/java/org/elasticsearch/discovery/Discovery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/Discovery.java rename to src/main/java/org/elasticsearch/discovery/Discovery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryException.java b/src/main/java/org/elasticsearch/discovery/DiscoveryException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryException.java rename to src/main/java/org/elasticsearch/discovery/DiscoveryException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java b/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java rename to src/main/java/org/elasticsearch/discovery/DiscoveryModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryService.java b/src/main/java/org/elasticsearch/discovery/DiscoveryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/DiscoveryService.java rename to src/main/java/org/elasticsearch/discovery/DiscoveryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java b/src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java rename to src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java b/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java rename to src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java rename to src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java b/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java rename to src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java b/src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java rename to src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java rename to src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java rename to src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java b/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java rename to src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java rename to src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java rename to src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java rename to src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java rename to src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingException.java b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingException.java rename to src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java rename to src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java rename to src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java rename to src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java rename to src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java b/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java rename to src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/env/Environment.java b/src/main/java/org/elasticsearch/env/Environment.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/env/Environment.java rename to src/main/java/org/elasticsearch/env/Environment.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/env/EnvironmentModule.java b/src/main/java/org/elasticsearch/env/EnvironmentModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/env/EnvironmentModule.java rename to src/main/java/org/elasticsearch/env/EnvironmentModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java b/src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java rename to src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/src/main/java/org/elasticsearch/env/NodeEnvironment.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/env/NodeEnvironment.java rename to src/main/java/org/elasticsearch/env/NodeEnvironment.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java b/src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java rename to src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/Gateway.java b/src/main/java/org/elasticsearch/gateway/Gateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/Gateway.java rename to src/main/java/org/elasticsearch/gateway/Gateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayException.java b/src/main/java/org/elasticsearch/gateway/GatewayException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayException.java rename to src/main/java/org/elasticsearch/gateway/GatewayException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java b/src/main/java/org/elasticsearch/gateway/GatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java rename to src/main/java/org/elasticsearch/gateway/GatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java b/src/main/java/org/elasticsearch/gateway/GatewayService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java rename to src/main/java/org/elasticsearch/gateway/GatewayService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/blobstore/BlobReuseExistingGatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/blobstore/BlobReuseExistingGatewayAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/blobstore/BlobReuseExistingGatewayAllocator.java rename to src/main/java/org/elasticsearch/gateway/blobstore/BlobReuseExistingGatewayAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGateway.java b/src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGateway.java rename to src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGatewayModule.java b/src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGatewayModule.java rename to src/main/java/org/elasticsearch/gateway/blobstore/BlobStoreGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java b/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGateway.java rename to src/main/java/org/elasticsearch/gateway/fs/FsGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java b/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java rename to src/main/java/org/elasticsearch/gateway/fs/FsGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGateway.java b/src/main/java/org/elasticsearch/gateway/local/LocalGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGateway.java rename to src/main/java/org/elasticsearch/gateway/local/LocalGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/local/LocalGatewayAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayAllocator.java rename to src/main/java/org/elasticsearch/gateway/local/LocalGatewayAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/local/LocalGatewayMetaState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayMetaState.java rename to src/main/java/org/elasticsearch/gateway/local/LocalGatewayMetaState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayModule.java b/src/main/java/org/elasticsearch/gateway/local/LocalGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayModule.java rename to src/main/java/org/elasticsearch/gateway/local/LocalGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayStartedShards.java b/src/main/java/org/elasticsearch/gateway/local/LocalGatewayStartedShards.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayStartedShards.java rename to src/main/java/org/elasticsearch/gateway/local/LocalGatewayStartedShards.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayMetaState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayMetaState.java rename to src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayMetaState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayStartedShards.java b/src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayStartedShards.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayStartedShards.java rename to src/main/java/org/elasticsearch/gateway/local/TransportNodesListGatewayStartedShards.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java b/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGateway.java rename to src/main/java/org/elasticsearch/gateway/none/NoneGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/none/NoneGatewayAllocator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayAllocator.java rename to src/main/java/org/elasticsearch/gateway/none/NoneGatewayAllocator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java b/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java rename to src/main/java/org/elasticsearch/gateway/none/NoneGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java b/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java rename to src/main/java/org/elasticsearch/gateway/shared/SharedStorageGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/BindHttpException.java b/src/main/java/org/elasticsearch/http/BindHttpException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/BindHttpException.java rename to src/main/java/org/elasticsearch/http/BindHttpException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpChannel.java b/src/main/java/org/elasticsearch/http/HttpChannel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpChannel.java rename to src/main/java/org/elasticsearch/http/HttpChannel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpException.java b/src/main/java/org/elasticsearch/http/HttpException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpException.java rename to src/main/java/org/elasticsearch/http/HttpException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpInfo.java b/src/main/java/org/elasticsearch/http/HttpInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpInfo.java rename to src/main/java/org/elasticsearch/http/HttpInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpRequest.java b/src/main/java/org/elasticsearch/http/HttpRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpRequest.java rename to src/main/java/org/elasticsearch/http/HttpRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpResponse.java b/src/main/java/org/elasticsearch/http/HttpResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpResponse.java rename to src/main/java/org/elasticsearch/http/HttpResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServer.java b/src/main/java/org/elasticsearch/http/HttpServer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServer.java rename to src/main/java/org/elasticsearch/http/HttpServer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerAdapter.java b/src/main/java/org/elasticsearch/http/HttpServerAdapter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerAdapter.java rename to src/main/java/org/elasticsearch/http/HttpServerAdapter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerModule.java b/src/main/java/org/elasticsearch/http/HttpServerModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerModule.java rename to src/main/java/org/elasticsearch/http/HttpServerModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerTransport.java b/src/main/java/org/elasticsearch/http/HttpServerTransport.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpServerTransport.java rename to src/main/java/org/elasticsearch/http/HttpServerTransport.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpStats.java b/src/main/java/org/elasticsearch/http/HttpStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/HttpStats.java rename to src/main/java/org/elasticsearch/http/HttpStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java b/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java rename to src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java rename to src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java rename to src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java rename to src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java rename to src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java b/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java rename to src/main/java/org/elasticsearch/index/AbstractIndexComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/AlreadyExpiredException.java b/src/main/java/org/elasticsearch/index/AlreadyExpiredException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/AlreadyExpiredException.java rename to src/main/java/org/elasticsearch/index/AlreadyExpiredException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/CloseableIndexComponent.java b/src/main/java/org/elasticsearch/index/CloseableIndexComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/CloseableIndexComponent.java rename to src/main/java/org/elasticsearch/index/CloseableIndexComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java b/src/main/java/org/elasticsearch/index/Index.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java rename to src/main/java/org/elasticsearch/index/Index.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexComponent.java b/src/main/java/org/elasticsearch/index/IndexComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexComponent.java rename to src/main/java/org/elasticsearch/index/IndexComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexException.java b/src/main/java/org/elasticsearch/index/IndexException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexException.java rename to src/main/java/org/elasticsearch/index/IndexException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java b/src/main/java/org/elasticsearch/index/IndexModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java rename to src/main/java/org/elasticsearch/index/IndexModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexNameModule.java b/src/main/java/org/elasticsearch/index/IndexNameModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexNameModule.java rename to src/main/java/org/elasticsearch/index/IndexNameModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java b/src/main/java/org/elasticsearch/index/IndexServiceManagement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java rename to src/main/java/org/elasticsearch/index/IndexServiceManagement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java b/src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java rename to src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexShardMissingException.java b/src/main/java/org/elasticsearch/index/IndexShardMissingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexShardMissingException.java rename to src/main/java/org/elasticsearch/index/IndexShardMissingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeId.java b/src/main/java/org/elasticsearch/index/LocalNodeId.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeId.java rename to src/main/java/org/elasticsearch/index/LocalNodeId.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java b/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java rename to src/main/java/org/elasticsearch/index/LocalNodeIdModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/VersionType.java b/src/main/java/org/elasticsearch/index/VersionType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/VersionType.java rename to src/main/java/org/elasticsearch/index/VersionType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java b/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java rename to src/main/java/org/elasticsearch/index/aliases/IndexAlias.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java b/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java rename to src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java b/src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java rename to src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/src/main/java/org/elasticsearch/index/analysis/Analysis.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/Analysis.java rename to src/main/java/org/elasticsearch/index/analysis/Analysis.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java rename to src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java rename to src/main/java/org/elasticsearch/index/analysis/AnalysisService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java rename to src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java b/src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java rename to src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java b/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java rename to src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java b/src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java rename to src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java rename to src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PositionIncrementGapAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/PositionIncrementGapAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PositionIncrementGapAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/PositionIncrementGapAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java b/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java b/src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java b/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java b/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java rename to src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java b/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java rename to src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java b/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java rename to src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java b/src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java rename to src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java rename to src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java rename to src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/DoubleMetaphoneFilter.java b/src/main/java/org/elasticsearch/index/analysis/phonetic/DoubleMetaphoneFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/DoubleMetaphoneFilter.java rename to src/main/java/org/elasticsearch/index/analysis/phonetic/DoubleMetaphoneFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticFilter.java b/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticFilter.java rename to src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java rename to src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/CacheStats.java b/src/main/java/org/elasticsearch/index/cache/CacheStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/CacheStats.java rename to src/main/java/org/elasticsearch/index/cache/CacheStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/src/main/java/org/elasticsearch/index/cache/IndexCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java rename to src/main/java/org/elasticsearch/index/cache/IndexCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java b/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java rename to src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/BloomCache.java b/src/main/java/org/elasticsearch/index/cache/bloom/BloomCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/BloomCache.java rename to src/main/java/org/elasticsearch/index/cache/bloom/BloomCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/BloomCacheModule.java b/src/main/java/org/elasticsearch/index/cache/bloom/BloomCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/BloomCacheModule.java rename to src/main/java/org/elasticsearch/index/cache/bloom/BloomCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java b/src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java rename to src/main/java/org/elasticsearch/index/cache/bloom/none/NoneBloomCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/simple/SimpleBloomCache.java b/src/main/java/org/elasticsearch/index/cache/bloom/simple/SimpleBloomCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/bloom/simple/SimpleBloomCache.java rename to src/main/java/org/elasticsearch/index/cache/bloom/simple/SimpleBloomCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java rename to src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java b/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java rename to src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java rename to src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java rename to src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java rename to src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java rename to src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java rename to src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java b/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java rename to src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/node/NodeFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/node/NodeFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/node/NodeFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/node/NodeFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/resident/ResidentFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/resident/ResidentFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/resident/ResidentFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/resident/ResidentFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/soft/SoftFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractWeightedFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractWeightedFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractWeightedFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/support/AbstractWeightedFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/CacheKeyFilter.java b/src/main/java/org/elasticsearch/index/cache/filter/support/CacheKeyFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/CacheKeyFilter.java rename to src/main/java/org/elasticsearch/index/cache/filter/support/CacheKeyFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/FilterCacheValue.java b/src/main/java/org/elasticsearch/index/cache/filter/support/FilterCacheValue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/FilterCacheValue.java rename to src/main/java/org/elasticsearch/index/cache/filter/support/FilterCacheValue.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java rename to src/main/java/org/elasticsearch/index/cache/filter/weak/WeakFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdCache.java b/src/main/java/org/elasticsearch/index/cache/id/IdCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdCache.java rename to src/main/java/org/elasticsearch/index/cache/id/IdCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdCacheModule.java b/src/main/java/org/elasticsearch/index/cache/id/IdCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdCacheModule.java rename to src/main/java/org/elasticsearch/index/cache/id/IdCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdReaderCache.java b/src/main/java/org/elasticsearch/index/cache/id/IdReaderCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdReaderCache.java rename to src/main/java/org/elasticsearch/index/cache/id/IdReaderCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdReaderTypeCache.java b/src/main/java/org/elasticsearch/index/cache/id/IdReaderTypeCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/IdReaderTypeCache.java rename to src/main/java/org/elasticsearch/index/cache/id/IdReaderTypeCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdCache.java b/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdCache.java rename to src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderCache.java b/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderCache.java rename to src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderTypeCache.java b/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderTypeCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderTypeCache.java rename to src/main/java/org/elasticsearch/index/cache/id/simple/SimpleIdReaderTypeCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCache.java b/src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCache.java rename to src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCacheModule.java b/src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCacheModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCacheModule.java rename to src/main/java/org/elasticsearch/index/cache/query/parser/QueryParserCacheModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/none/NoneQueryParserCache.java b/src/main/java/org/elasticsearch/index/cache/query/parser/none/NoneQueryParserCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/none/NoneQueryParserCache.java rename to src/main/java/org/elasticsearch/index/cache/query/parser/none/NoneQueryParserCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/soft/SoftQueryParserCache.java b/src/main/java/org/elasticsearch/index/cache/query/parser/soft/SoftQueryParserCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/soft/SoftQueryParserCache.java rename to src/main/java/org/elasticsearch/index/cache/query/parser/soft/SoftQueryParserCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/support/AbstractJvmQueryParserCache.java b/src/main/java/org/elasticsearch/index/cache/query/parser/support/AbstractJvmQueryParserCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/support/AbstractJvmQueryParserCache.java rename to src/main/java/org/elasticsearch/index/cache/query/parser/support/AbstractJvmQueryParserCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/weak/WeakQueryParserCache.java b/src/main/java/org/elasticsearch/index/cache/query/parser/weak/WeakQueryParserCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/query/parser/weak/WeakQueryParserCache.java rename to src/main/java/org/elasticsearch/index/cache/query/parser/weak/WeakQueryParserCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java b/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java rename to src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java b/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java rename to src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java b/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java rename to src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java b/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java rename to src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java b/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java rename to src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java b/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java rename to src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/CloseEngineException.java b/src/main/java/org/elasticsearch/index/engine/CloseEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/CloseEngineException.java rename to src/main/java/org/elasticsearch/index/engine/CloseEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsEngineException.java b/src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsEngineException.java rename to src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/Engine.java b/src/main/java/org/elasticsearch/index/engine/Engine.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/Engine.java rename to src/main/java/org/elasticsearch/index/engine/Engine.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java b/src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java rename to src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java b/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java rename to src/main/java/org/elasticsearch/index/engine/EngineClosedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java b/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java rename to src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineException.java b/src/main/java/org/elasticsearch/index/engine/EngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineException.java rename to src/main/java/org/elasticsearch/index/engine/EngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineModule.java b/src/main/java/org/elasticsearch/index/engine/EngineModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/EngineModule.java rename to src/main/java/org/elasticsearch/index/engine/EngineModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java b/src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java b/src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java rename to src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexEngine.java b/src/main/java/org/elasticsearch/index/engine/IndexEngine.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexEngine.java rename to src/main/java/org/elasticsearch/index/engine/IndexEngine.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java b/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java rename to src/main/java/org/elasticsearch/index/engine/IndexEngineModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/OptimizeFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/OptimizeFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/OptimizeFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/OptimizeFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java b/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java rename to src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java b/src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/Segment.java b/src/main/java/org/elasticsearch/index/engine/Segment.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/Segment.java rename to src/main/java/org/elasticsearch/index/engine/Segment.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java b/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java rename to src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java b/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java rename to src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java b/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java rename to src/main/java/org/elasticsearch/index/engine/robin/RobinEngine.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java b/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java rename to src/main/java/org/elasticsearch/index/engine/robin/RobinEngineModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java b/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java rename to src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngine.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java b/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java rename to src/main/java/org/elasticsearch/index/engine/robin/RobinIndexEngineModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/DocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java b/src/main/java/org/elasticsearch/index/field/data/FieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java rename to src/main/java/org/elasticsearch/index/field/data/FieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/FieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java b/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/bytes/ByteDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/ByteDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldData.java b/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataMissingComparator.java b/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataMissingComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataMissingComparator.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataMissingComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/ByteFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java b/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/SingleValueByteFieldData.java b/src/main/java/org/elasticsearch/index/field/data/bytes/SingleValueByteFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/bytes/SingleValueByteFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/bytes/SingleValueByteFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java b/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataMissingComparator.java b/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataMissingComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataMissingComparator.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataMissingComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java b/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java b/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java b/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataMissingComparator.java b/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataMissingComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataMissingComparator.java rename to src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataMissingComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java b/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java b/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java b/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataMissingComparator.java b/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataMissingComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataMissingComparator.java rename to src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataMissingComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/ints/IntFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java b/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java b/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java b/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataMissingComparator.java b/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataMissingComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataMissingComparator.java rename to src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataMissingComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/longs/LongFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java b/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java b/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java b/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java b/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataMissingComparator.java b/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataMissingComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataMissingComparator.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataMissingComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java b/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java b/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java b/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java b/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java b/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java rename to src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java b/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java rename to src/main/java/org/elasticsearch/index/field/data/strings/StringFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringOrdValFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/strings/StringOrdValFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringOrdValFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/strings/StringOrdValFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringValFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/strings/StringValFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringValFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/strings/StringValFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java b/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java rename to src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/NumericFieldDataComparator.java b/src/main/java/org/elasticsearch/index/field/data/support/NumericFieldDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/NumericFieldDataComparator.java rename to src/main/java/org/elasticsearch/index/field/data/support/NumericFieldDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/function/sort/DoubleFieldsFunctionDataComparator.java b/src/main/java/org/elasticsearch/index/field/function/sort/DoubleFieldsFunctionDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/function/sort/DoubleFieldsFunctionDataComparator.java rename to src/main/java/org/elasticsearch/index/field/function/sort/DoubleFieldsFunctionDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/field/function/sort/StringFieldsFunctionDataComparator.java b/src/main/java/org/elasticsearch/index/field/function/sort/StringFieldsFunctionDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/field/function/sort/StringFieldsFunctionDataComparator.java rename to src/main/java/org/elasticsearch/index/field/function/sort/StringFieldsFunctionDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/flush/FlushStats.java b/src/main/java/org/elasticsearch/index/flush/FlushStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/flush/FlushStats.java rename to src/main/java/org/elasticsearch/index/flush/FlushStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/CommitPoint.java b/src/main/java/org/elasticsearch/index/gateway/CommitPoint.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/CommitPoint.java rename to src/main/java/org/elasticsearch/index/gateway/CommitPoint.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/CommitPoints.java b/src/main/java/org/elasticsearch/index/gateway/CommitPoints.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/CommitPoints.java rename to src/main/java/org/elasticsearch/index/gateway/CommitPoints.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java b/src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java rename to src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGateway.java b/src/main/java/org/elasticsearch/index/gateway/IndexGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGateway.java rename to src/main/java/org/elasticsearch/index/gateway/IndexGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java b/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java rename to src/main/java/org/elasticsearch/index/gateway/IndexGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java rename to src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/RecoveryStatus.java b/src/main/java/org/elasticsearch/index/gateway/RecoveryStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/RecoveryStatus.java rename to src/main/java/org/elasticsearch/index/gateway/RecoveryStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java b/src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java rename to src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexGateway.java b/src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexGateway.java rename to src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexShardGateway.java b/src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexShardGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexShardGateway.java rename to src/main/java/org/elasticsearch/index/gateway/blobstore/BlobStoreIndexShardGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java b/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java rename to src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java b/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java rename to src/main/java/org/elasticsearch/index/gateway/fs/FsIndexGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java b/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java rename to src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGateway.java b/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGateway.java rename to src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGatewayModule.java b/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGatewayModule.java rename to src/main/java/org/elasticsearch/index/gateway/local/LocalIndexGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java b/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java rename to src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java b/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java rename to src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java b/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java rename to src/main/java/org/elasticsearch/index/gateway/none/NoneIndexGatewayModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java b/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java rename to src/main/java/org/elasticsearch/index/gateway/none/NoneIndexShardGateway.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/get/GetField.java b/src/main/java/org/elasticsearch/index/get/GetField.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/get/GetField.java rename to src/main/java/org/elasticsearch/index/get/GetField.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/get/GetResult.java b/src/main/java/org/elasticsearch/index/get/GetResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/get/GetResult.java rename to src/main/java/org/elasticsearch/index/get/GetResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/get/GetStats.java b/src/main/java/org/elasticsearch/index/get/GetStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/get/GetStats.java rename to src/main/java/org/elasticsearch/index/get/GetStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/get/ShardGetModule.java b/src/main/java/org/elasticsearch/index/get/ShardGetModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/get/ShardGetModule.java rename to src/main/java/org/elasticsearch/index/get/ShardGetModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/src/main/java/org/elasticsearch/index/get/ShardGetService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/get/ShardGetService.java rename to src/main/java/org/elasticsearch/index/get/ShardGetService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java b/src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java rename to src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/IndexingStats.java b/src/main/java/org/elasticsearch/index/indexing/IndexingStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/IndexingStats.java rename to src/main/java/org/elasticsearch/index/indexing/IndexingStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java b/src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java rename to src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java b/src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java rename to src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ContentPath.java b/src/main/java/org/elasticsearch/index/mapper/ContentPath.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ContentPath.java rename to src/main/java/org/elasticsearch/index/mapper/ContentPath.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java rename to src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java rename to src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java rename to src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FailedToGenerateSourceMapperException.java b/src/main/java/org/elasticsearch/index/mapper/FailedToGenerateSourceMapperException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FailedToGenerateSourceMapperException.java rename to src/main/java/org/elasticsearch/index/mapper/FailedToGenerateSourceMapperException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/FieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapperListener.java b/src/main/java/org/elasticsearch/index/mapper/FieldMapperListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapperListener.java rename to src/main/java/org/elasticsearch/index/mapper/FieldMapperListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java b/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java rename to src/main/java/org/elasticsearch/index/mapper/FieldMappers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/InternalMapper.java b/src/main/java/org/elasticsearch/index/mapper/InternalMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/InternalMapper.java rename to src/main/java/org/elasticsearch/index/mapper/InternalMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/src/main/java/org/elasticsearch/index/mapper/Mapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Mapper.java rename to src/main/java/org/elasticsearch/index/mapper/Mapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java b/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java rename to src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java b/src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java rename to src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperException.java b/src/main/java/org/elasticsearch/index/mapper/MapperException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperException.java rename to src/main/java/org/elasticsearch/index/mapper/MapperException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java b/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java rename to src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java rename to src/main/java/org/elasticsearch/index/mapper/MapperService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java b/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java rename to src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MergeContext.java b/src/main/java/org/elasticsearch/index/mapper/MergeContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MergeContext.java rename to src/main/java/org/elasticsearch/index/mapper/MergeContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java b/src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java rename to src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ObjectMapperListener.java b/src/main/java/org/elasticsearch/index/mapper/ObjectMapperListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ObjectMapperListener.java rename to src/main/java/org/elasticsearch/index/mapper/ObjectMapperListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java b/src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java rename to src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/src/main/java/org/elasticsearch/index/mapper/ParseContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ParseContext.java rename to src/main/java/org/elasticsearch/index/mapper/ParseContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java b/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java rename to src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/RootMapper.java b/src/main/java/org/elasticsearch/index/mapper/RootMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/RootMapper.java rename to src/main/java/org/elasticsearch/index/mapper/RootMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java b/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java rename to src/main/java/org/elasticsearch/index/mapper/SourceToParse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java b/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java rename to src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Uid.java b/src/main/java/org/elasticsearch/index/mapper/Uid.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/Uid.java rename to src/main/java/org/elasticsearch/index/mapper/Uid.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java b/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java rename to src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/default-mapping.json b/src/main/java/org/elasticsearch/index/mapper/default-mapping.json similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/default-mapping.json rename to src/main/java/org/elasticsearch/index/mapper/default-mapping.json diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPoint.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPoint.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPoint.java rename to src/main/java/org/elasticsearch/index/mapper/geo/GeoPoint.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointDocFieldData.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointDocFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointDocFieldData.java rename to src/main/java/org/elasticsearch/index/mapper/geo/GeoPointDocFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldData.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldData.java rename to src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldDataType.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldDataType.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldDataType.java rename to src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldDataType.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java b/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java rename to src/main/java/org/elasticsearch/index/mapper/geo/MultiValueGeoPointFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/SingleValueGeoPointFieldData.java b/src/main/java/org/elasticsearch/index/mapper/geo/SingleValueGeoPointFieldData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/geo/SingleValueGeoPointFieldData.java rename to src/main/java/org/elasticsearch/index/mapper/geo/SingleValueGeoPointFieldData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AnalyzerMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/AnalyzerMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AnalyzerMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/AnalyzerMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/BoostFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/BoostFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/BoostFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/BoostFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldSelector.java b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldSelector.java rename to src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java rename to src/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java b/src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java rename to src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java b/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java rename to src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java b/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java rename to src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java b/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java rename to src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/AllButSourceFieldSelector.java b/src/main/java/org/elasticsearch/index/mapper/selector/AllButSourceFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/AllButSourceFieldSelector.java rename to src/main/java/org/elasticsearch/index/mapper/selector/AllButSourceFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/FieldMappersFieldSelector.java b/src/main/java/org/elasticsearch/index/mapper/selector/FieldMappersFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/FieldMappersFieldSelector.java rename to src/main/java/org/elasticsearch/index/mapper/selector/FieldMappersFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/UidAndSourceFieldSelector.java b/src/main/java/org/elasticsearch/index/mapper/selector/UidAndSourceFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/UidAndSourceFieldSelector.java rename to src/main/java/org/elasticsearch/index/mapper/selector/UidAndSourceFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/UidFieldSelector.java b/src/main/java/org/elasticsearch/index/mapper/selector/UidFieldSelector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/selector/UidFieldSelector.java rename to src/main/java/org/elasticsearch/index/mapper/selector/UidFieldSelector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/MergeStats.java b/src/main/java/org/elasticsearch/index/merge/MergeStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/MergeStats.java rename to src/main/java/org/elasticsearch/index/merge/MergeStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/EnableMergePolicy.java b/src/main/java/org/elasticsearch/index/merge/policy/EnableMergePolicy.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/EnableMergePolicy.java rename to src/main/java/org/elasticsearch/index/merge/policy/EnableMergePolicy.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java rename to src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java rename to src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java b/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java rename to src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java rename to src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java rename to src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java rename to src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java b/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java rename to src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java rename to src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java rename to src/main/java/org/elasticsearch/index/merge/scheduler/SerialMergeSchedulerProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolateIndexUnavailable.java b/src/main/java/org/elasticsearch/index/percolator/PercolateIndexUnavailable.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolateIndexUnavailable.java rename to src/main/java/org/elasticsearch/index/percolator/PercolateIndexUnavailable.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorException.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorException.java rename to src/main/java/org/elasticsearch/index/percolator/PercolatorException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java rename to src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java rename to src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java rename to src/main/java/org/elasticsearch/index/percolator/PercolatorService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/AndFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/AndFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/AndFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/AndFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/AndFilterParser.java b/src/main/java/org/elasticsearch/index/query/AndFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/AndFilterParser.java rename to src/main/java/org/elasticsearch/index/query/AndFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/BoolFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/BoolFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolFilterParser.java b/src/main/java/org/elasticsearch/index/query/BoolFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolFilterParser.java rename to src/main/java/org/elasticsearch/index/query/BoolFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java b/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java rename to src/main/java/org/elasticsearch/index/query/BoolQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java b/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java rename to src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java b/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java rename to src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryParser.java b/src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryParser.java rename to src/main/java/org/elasticsearch/index/query/CustomBoostFactorQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java b/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java rename to src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomScoreQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/CustomScoreQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomScoreQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/CustomScoreQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomScoreQueryParser.java b/src/main/java/org/elasticsearch/index/query/CustomScoreQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/CustomScoreQueryParser.java rename to src/main/java/org/elasticsearch/index/query/CustomScoreQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java b/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java rename to src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ExistsFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/ExistsFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ExistsFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/ExistsFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ExistsFilterParser.java b/src/main/java/org/elasticsearch/index/query/ExistsFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ExistsFilterParser.java rename to src/main/java/org/elasticsearch/index/query/ExistsFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java b/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java rename to src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java b/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java rename to src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/FieldQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/FieldQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldQueryParser.java b/src/main/java/org/elasticsearch/index/query/FieldQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FieldQueryParser.java rename to src/main/java/org/elasticsearch/index/query/FieldQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterBuilder.java b/src/main/java/org/elasticsearch/index/query/FilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/FilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterBuilders.java b/src/main/java/org/elasticsearch/index/query/FilterBuilders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterBuilders.java rename to src/main/java/org/elasticsearch/index/query/FilterBuilders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterParser.java b/src/main/java/org/elasticsearch/index/query/FilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterParser.java rename to src/main/java/org/elasticsearch/index/query/FilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterParserFactory.java b/src/main/java/org/elasticsearch/index/query/FilterParserFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilterParserFactory.java rename to src/main/java/org/elasticsearch/index/query/FilterParserFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java b/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java rename to src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryParser.java b/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryParser.java rename to src/main/java/org/elasticsearch/index/query/FuzzyLikeThisFieldQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryParser.java b/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryParser.java rename to src/main/java/org/elasticsearch/index/query/FuzzyLikeThisQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java b/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java rename to src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterParser.java b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterParser.java rename to src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/GeoDistanceFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java rename to src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterParser.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterParser.java rename to src/main/java/org/elasticsearch/index/query/GeoDistanceRangeFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoPolygonFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/GeoPolygonFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoPolygonFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/GeoPolygonFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoPolygonFilterParser.java b/src/main/java/org/elasticsearch/index/query/GeoPolygonFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/GeoPolygonFilterParser.java rename to src/main/java/org/elasticsearch/index/query/GeoPolygonFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/HasChildFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/HasChildFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildFilterParser.java b/src/main/java/org/elasticsearch/index/query/HasChildFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildFilterParser.java rename to src/main/java/org/elasticsearch/index/query/HasChildFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java b/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java rename to src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/IdsFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/IdsFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsFilterParser.java b/src/main/java/org/elasticsearch/index/query/IdsFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsFilterParser.java rename to src/main/java/org/elasticsearch/index/query/IdsFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java b/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java rename to src/main/java/org/elasticsearch/index/query/IdsQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java b/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java rename to src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java b/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java rename to src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java b/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java rename to src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/LimitFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/LimitFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/LimitFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/LimitFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/LimitFilterParser.java b/src/main/java/org/elasticsearch/index/query/LimitFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/LimitFilterParser.java rename to src/main/java/org/elasticsearch/index/query/LimitFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/MatchAllFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/MatchAllFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java b/src/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java rename to src/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java b/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java rename to src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MissingFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/MissingFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MissingFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/MissingFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MissingFilterParser.java b/src/main/java/org/elasticsearch/index/query/MissingFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MissingFilterParser.java rename to src/main/java/org/elasticsearch/index/query/MissingFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryParser.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryParser.java rename to src/main/java/org/elasticsearch/index/query/MoreLikeThisFieldQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java rename to src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/NestedFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/NestedFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java b/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedFilterParser.java rename to src/main/java/org/elasticsearch/index/query/NestedFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java b/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java rename to src/main/java/org/elasticsearch/index/query/NestedQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NotFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/NotFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NotFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/NotFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NotFilterParser.java b/src/main/java/org/elasticsearch/index/query/NotFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NotFilterParser.java rename to src/main/java/org/elasticsearch/index/query/NotFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NumericRangeFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/NumericRangeFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NumericRangeFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/NumericRangeFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NumericRangeFilterParser.java b/src/main/java/org/elasticsearch/index/query/NumericRangeFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NumericRangeFilterParser.java rename to src/main/java/org/elasticsearch/index/query/NumericRangeFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/OrFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/OrFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/OrFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/OrFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/OrFilterParser.java b/src/main/java/org/elasticsearch/index/query/OrFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/OrFilterParser.java rename to src/main/java/org/elasticsearch/index/query/OrFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ParsedQuery.java b/src/main/java/org/elasticsearch/index/query/ParsedQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ParsedQuery.java rename to src/main/java/org/elasticsearch/index/query/ParsedQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/PrefixFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/PrefixFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixFilterParser.java b/src/main/java/org/elasticsearch/index/query/PrefixFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixFilterParser.java rename to src/main/java/org/elasticsearch/index/query/PrefixFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java b/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java rename to src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilder.java b/src/main/java/org/elasticsearch/index/query/QueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/QueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilderException.java b/src/main/java/org/elasticsearch/index/query/QueryBuilderException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilderException.java rename to src/main/java/org/elasticsearch/index/query/QueryBuilderException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/src/main/java/org/elasticsearch/index/query/QueryBuilders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilders.java rename to src/main/java/org/elasticsearch/index/query/QueryBuilders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java b/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java rename to src/main/java/org/elasticsearch/index/query/QueryFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParseContext.java rename to src/main/java/org/elasticsearch/index/query/QueryParseContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParser.java b/src/main/java/org/elasticsearch/index/query/QueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParser.java rename to src/main/java/org/elasticsearch/index/query/QueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParserFactory.java b/src/main/java/org/elasticsearch/index/query/QueryParserFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParserFactory.java rename to src/main/java/org/elasticsearch/index/query/QueryParserFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParsingException.java b/src/main/java/org/elasticsearch/index/query/QueryParsingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryParsingException.java rename to src/main/java/org/elasticsearch/index/query/QueryParsingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java b/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java rename to src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/RangeFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/RangeFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeFilterParser.java b/src/main/java/org/elasticsearch/index/query/RangeFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeFilterParser.java rename to src/main/java/org/elasticsearch/index/query/RangeFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java b/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java rename to src/main/java/org/elasticsearch/index/query/RangeQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/ScriptFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/ScriptFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java b/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java rename to src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java rename to src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java rename to src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java rename to src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java rename to src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java rename to src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/TermFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/TermFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermFilterParser.java b/src/main/java/org/elasticsearch/index/query/TermFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermFilterParser.java rename to src/main/java/org/elasticsearch/index/query/TermFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermQueryParser.java b/src/main/java/org/elasticsearch/index/query/TermQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermQueryParser.java rename to src/main/java/org/elasticsearch/index/query/TermQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/TermsFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/TermsFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsFilterParser.java b/src/main/java/org/elasticsearch/index/query/TermsFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsFilterParser.java rename to src/main/java/org/elasticsearch/index/query/TermsFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java b/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java rename to src/main/java/org/elasticsearch/index/query/TermsQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TextQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TextQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TextQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/TextQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TextQueryParser.java b/src/main/java/org/elasticsearch/index/query/TextQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TextQueryParser.java rename to src/main/java/org/elasticsearch/index/query/TextQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TopChildrenQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TopChildrenQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TopChildrenQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/TopChildrenQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TopChildrenQueryParser.java b/src/main/java/org/elasticsearch/index/query/TopChildrenQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TopChildrenQueryParser.java rename to src/main/java/org/elasticsearch/index/query/TopChildrenQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TypeFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/TypeFilterBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TypeFilterBuilder.java rename to src/main/java/org/elasticsearch/index/query/TypeFilterBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TypeFilterParser.java b/src/main/java/org/elasticsearch/index/query/TypeFilterParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TypeFilterParser.java rename to src/main/java/org/elasticsearch/index/query/TypeFilterParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java b/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java rename to src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java rename to src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java b/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java rename to src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java b/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java rename to src/main/java/org/elasticsearch/index/query/support/QueryParsers.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java b/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java rename to src/main/java/org/elasticsearch/index/refresh/RefreshStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java b/src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java rename to src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/TextQueryParser.java b/src/main/java/org/elasticsearch/index/search/TextQueryParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/TextQueryParser.java rename to src/main/java/org/elasticsearch/index/search/TextQueryParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/UidFilter.java b/src/main/java/org/elasticsearch/index/search/UidFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/UidFilter.java rename to src/main/java/org/elasticsearch/index/search/UidFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/ChildCollector.java b/src/main/java/org/elasticsearch/index/search/child/ChildCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/ChildCollector.java rename to src/main/java/org/elasticsearch/index/search/child/ChildCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/HasChildFilter.java b/src/main/java/org/elasticsearch/index/search/child/HasChildFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/HasChildFilter.java rename to src/main/java/org/elasticsearch/index/search/child/HasChildFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java rename to src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistance.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistance.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistance.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoDistance.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceDataComparator.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceDataComparator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceDataComparator.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoDistanceDataComparator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoHashUtils.java b/src/main/java/org/elasticsearch/index/search/geo/GeoHashUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoHashUtils.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoHashUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoUtils.java b/src/main/java/org/elasticsearch/index/search/geo/GeoUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoUtils.java rename to src/main/java/org/elasticsearch/index/search/geo/GeoUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java b/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java rename to src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java rename to src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/Point.java b/src/main/java/org/elasticsearch/index/search/geo/Point.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/Point.java rename to src/main/java/org/elasticsearch/index/search/geo/Point.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java b/src/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java rename to src/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NestedChildrenCollector.java b/src/main/java/org/elasticsearch/index/search/nested/NestedChildrenCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NestedChildrenCollector.java rename to src/main/java/org/elasticsearch/index/search/nested/NestedChildrenCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NestedDocsFilter.java b/src/main/java/org/elasticsearch/index/search/nested/NestedDocsFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NestedDocsFilter.java rename to src/main/java/org/elasticsearch/index/search/nested/NestedDocsFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java b/src/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java rename to src/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java b/src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java rename to src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java b/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java rename to src/main/java/org/elasticsearch/index/search/stats/SearchStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java b/src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java rename to src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java b/src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java rename to src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java b/src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java rename to src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java b/src/main/java/org/elasticsearch/index/service/IndexService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java rename to src/main/java/org/elasticsearch/index/service/IndexService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java b/src/main/java/org/elasticsearch/index/service/InternalIndexService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java rename to src/main/java/org/elasticsearch/index/service/InternalIndexService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettings.java b/src/main/java/org/elasticsearch/index/settings/IndexSettings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettings.java rename to src/main/java/org/elasticsearch/index/settings/IndexSettings.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java b/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java rename to src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java b/src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java rename to src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java b/src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java rename to src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java b/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java rename to src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/DocsStats.java b/src/main/java/org/elasticsearch/index/shard/DocsStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/DocsStats.java rename to src/main/java/org/elasticsearch/index/shard/DocsStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java b/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java rename to src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java b/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java b/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardManagement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java b/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java b/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardState.java b/src/main/java/org/elasticsearch/index/shard/IndexShardState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/IndexShardState.java rename to src/main/java/org/elasticsearch/index/shard/IndexShardState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/ShardId.java b/src/main/java/org/elasticsearch/index/shard/ShardId.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/ShardId.java rename to src/main/java/org/elasticsearch/index/shard/ShardId.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/service/IndexShard.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/IndexShard.java rename to src/main/java/org/elasticsearch/index/shard/service/IndexShard.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java b/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java rename to src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java rename to src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java rename to src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java rename to src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java rename to src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProviderFactory.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityProviderFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityProviderFactory.java rename to src/main/java/org/elasticsearch/index/similarity/SimilarityProviderFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java rename to src/main/java/org/elasticsearch/index/similarity/SimilarityService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/DirectoryService.java b/src/main/java/org/elasticsearch/index/store/DirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/DirectoryService.java rename to src/main/java/org/elasticsearch/index/store/DirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/IndexStore.java b/src/main/java/org/elasticsearch/index/store/IndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/IndexStore.java rename to src/main/java/org/elasticsearch/index/store/IndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/IndexStoreModule.java b/src/main/java/org/elasticsearch/index/store/IndexStoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/IndexStoreModule.java rename to src/main/java/org/elasticsearch/index/store/IndexStoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/Store.java b/src/main/java/org/elasticsearch/index/store/Store.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/Store.java rename to src/main/java/org/elasticsearch/index/store/Store.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreException.java b/src/main/java/org/elasticsearch/index/store/StoreException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreException.java rename to src/main/java/org/elasticsearch/index/store/StoreException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java b/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java rename to src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreManagement.java b/src/main/java/org/elasticsearch/index/store/StoreManagement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreManagement.java rename to src/main/java/org/elasticsearch/index/store/StoreManagement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreModule.java b/src/main/java/org/elasticsearch/index/store/StoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreModule.java rename to src/main/java/org/elasticsearch/index/store/StoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreStats.java b/src/main/java/org/elasticsearch/index/store/StoreStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/StoreStats.java rename to src/main/java/org/elasticsearch/index/store/StoreStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/FsDirectoryService.java b/src/main/java/org/elasticsearch/index/store/fs/FsDirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/FsDirectoryService.java rename to src/main/java/org/elasticsearch/index/store/fs/FsDirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/FsIndexStore.java b/src/main/java/org/elasticsearch/index/store/fs/FsIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/FsIndexStore.java rename to src/main/java/org/elasticsearch/index/store/fs/FsIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java b/src/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java rename to src/main/java/org/elasticsearch/index/store/fs/MmapFsDirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStore.java b/src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStore.java rename to src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStoreModule.java b/src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStoreModule.java rename to src/main/java/org/elasticsearch/index/store/fs/MmapFsIndexStoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java b/src/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java rename to src/main/java/org/elasticsearch/index/store/fs/NioFsDirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStore.java b/src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStore.java rename to src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStoreModule.java b/src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStoreModule.java rename to src/main/java/org/elasticsearch/index/store/fs/NioFsIndexStoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java b/src/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java rename to src/main/java/org/elasticsearch/index/store/fs/SimpleFsDirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStore.java b/src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStore.java rename to src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStoreModule.java b/src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStoreModule.java rename to src/main/java/org/elasticsearch/index/store/fs/SimpleFsIndexStoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java b/src/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java rename to src/main/java/org/elasticsearch/index/store/memory/ByteBufferDirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferIndexStore.java b/src/main/java/org/elasticsearch/index/store/memory/ByteBufferIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/ByteBufferIndexStore.java rename to src/main/java/org/elasticsearch/index/store/memory/ByteBufferIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/MemoryIndexStoreModule.java b/src/main/java/org/elasticsearch/index/store/memory/MemoryIndexStoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/memory/MemoryIndexStoreModule.java rename to src/main/java/org/elasticsearch/index/store/memory/MemoryIndexStoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java b/src/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java rename to src/main/java/org/elasticsearch/index/store/ram/RamDirectoryService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamIndexStore.java b/src/main/java/org/elasticsearch/index/store/ram/RamIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamIndexStore.java rename to src/main/java/org/elasticsearch/index/store/ram/RamIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamIndexStoreModule.java b/src/main/java/org/elasticsearch/index/store/ram/RamIndexStoreModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/ram/RamIndexStoreModule.java rename to src/main/java/org/elasticsearch/index/store/ram/RamIndexStoreModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/support/AbstractIndexStore.java b/src/main/java/org/elasticsearch/index/store/support/AbstractIndexStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/support/AbstractIndexStore.java rename to src/main/java/org/elasticsearch/index/store/support/AbstractIndexStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/store/support/ForceSyncDirectory.java b/src/main/java/org/elasticsearch/index/store/support/ForceSyncDirectory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/store/support/ForceSyncDirectory.java rename to src/main/java/org/elasticsearch/index/store/support/ForceSyncDirectory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/Translog.java b/src/main/java/org/elasticsearch/index/translog/Translog.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/Translog.java rename to src/main/java/org/elasticsearch/index/translog/Translog.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogException.java b/src/main/java/org/elasticsearch/index/translog/TranslogException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogException.java rename to src/main/java/org/elasticsearch/index/translog/TranslogException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java b/src/main/java/org/elasticsearch/index/translog/TranslogModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogModule.java rename to src/main/java/org/elasticsearch/index/translog/TranslogModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogService.java b/src/main/java/org/elasticsearch/index/translog/TranslogService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogService.java rename to src/main/java/org/elasticsearch/index/translog/TranslogService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogStreams.java b/src/main/java/org/elasticsearch/index/translog/TranslogStreams.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/TranslogStreams.java rename to src/main/java/org/elasticsearch/index/translog/TranslogStreams.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java b/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java rename to src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java rename to src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java rename to src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/RafReference.java b/src/main/java/org/elasticsearch/index/translog/fs/RafReference.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/RafReference.java rename to src/main/java/org/elasticsearch/index/translog/fs/RafReference.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java b/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java rename to src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java b/src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java rename to src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexCreationException.java b/src/main/java/org/elasticsearch/indices/IndexCreationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexCreationException.java rename to src/main/java/org/elasticsearch/indices/IndexCreationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexMissingException.java b/src/main/java/org/elasticsearch/indices/IndexMissingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexMissingException.java rename to src/main/java/org/elasticsearch/indices/IndexMissingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java b/src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java rename to src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java b/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java rename to src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesLifecycle.java b/src/main/java/org/elasticsearch/indices/IndicesLifecycle.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesLifecycle.java rename to src/main/java/org/elasticsearch/indices/IndicesLifecycle.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesModule.java b/src/main/java/org/elasticsearch/indices/IndicesModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesModule.java rename to src/main/java/org/elasticsearch/indices/IndicesModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesService.java b/src/main/java/org/elasticsearch/indices/IndicesService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesService.java rename to src/main/java/org/elasticsearch/indices/IndicesService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java b/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java rename to src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java b/src/main/java/org/elasticsearch/indices/InternalIndicesService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java rename to src/main/java/org/elasticsearch/indices/InternalIndicesService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java b/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java rename to src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java b/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java rename to src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java b/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java rename to src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java b/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java rename to src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java b/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java rename to src/main/java/org/elasticsearch/indices/NodeIndicesStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/TypeMissingException.java b/src/main/java/org/elasticsearch/indices/TypeMissingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/TypeMissingException.java rename to src/main/java/org/elasticsearch/indices/TypeMissingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java b/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java rename to src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java b/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java rename to src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cache/filter/IndicesNodeFilterCache.java b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesNodeFilterCache.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/cache/filter/IndicesNodeFilterCache.java rename to src/main/java/org/elasticsearch/indices/cache/filter/IndicesNodeFilterCache.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java rename to src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryBufferController.java b/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryBufferController.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryBufferController.java rename to src/main/java/org/elasticsearch/indices/memory/IndexingMemoryBufferController.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java b/src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java rename to src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java b/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java rename to src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java b/src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java rename to src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java rename to src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/src/main/java/org/elasticsearch/indices/store/IndicesStore.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/IndicesStore.java rename to src/main/java/org/elasticsearch/indices/store/IndicesStore.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java rename to src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java rename to src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxClusterService.java b/src/main/java/org/elasticsearch/jmx/JmxClusterService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxClusterService.java rename to src/main/java/org/elasticsearch/jmx/JmxClusterService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxConnectorCreationException.java b/src/main/java/org/elasticsearch/jmx/JmxConnectorCreationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxConnectorCreationException.java rename to src/main/java/org/elasticsearch/jmx/JmxConnectorCreationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxException.java b/src/main/java/org/elasticsearch/jmx/JmxException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxException.java rename to src/main/java/org/elasticsearch/jmx/JmxException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java b/src/main/java/org/elasticsearch/jmx/JmxModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java rename to src/main/java/org/elasticsearch/jmx/JmxModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxRegistrationException.java b/src/main/java/org/elasticsearch/jmx/JmxRegistrationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxRegistrationException.java rename to src/main/java/org/elasticsearch/jmx/JmxRegistrationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java b/src/main/java/org/elasticsearch/jmx/JmxService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java rename to src/main/java/org/elasticsearch/jmx/JmxService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/MBean.java b/src/main/java/org/elasticsearch/jmx/MBean.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/MBean.java rename to src/main/java/org/elasticsearch/jmx/MBean.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ManagedAttribute.java b/src/main/java/org/elasticsearch/jmx/ManagedAttribute.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ManagedAttribute.java rename to src/main/java/org/elasticsearch/jmx/ManagedAttribute.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ManagedGroupName.java b/src/main/java/org/elasticsearch/jmx/ManagedGroupName.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ManagedGroupName.java rename to src/main/java/org/elasticsearch/jmx/ManagedGroupName.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ManagedOperation.java b/src/main/java/org/elasticsearch/jmx/ManagedOperation.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ManagedOperation.java rename to src/main/java/org/elasticsearch/jmx/ManagedOperation.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ResourceDMBean.java b/src/main/java/org/elasticsearch/jmx/ResourceDMBean.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/ResourceDMBean.java rename to src/main/java/org/elasticsearch/jmx/ResourceDMBean.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java b/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java rename to src/main/java/org/elasticsearch/jmx/action/GetJmxServiceUrlAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorModule.java b/src/main/java/org/elasticsearch/monitor/MonitorModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorModule.java rename to src/main/java/org/elasticsearch/monitor/MonitorModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorService.java b/src/main/java/org/elasticsearch/monitor/MonitorService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/MonitorService.java rename to src/main/java/org/elasticsearch/monitor/MonitorService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/AbstractDump.java b/src/main/java/org/elasticsearch/monitor/dump/AbstractDump.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/AbstractDump.java rename to src/main/java/org/elasticsearch/monitor/dump/AbstractDump.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/Dump.java b/src/main/java/org/elasticsearch/monitor/dump/Dump.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/Dump.java rename to src/main/java/org/elasticsearch/monitor/dump/Dump.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpContributionFailedException.java b/src/main/java/org/elasticsearch/monitor/dump/DumpContributionFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpContributionFailedException.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpContributionFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpContributor.java b/src/main/java/org/elasticsearch/monitor/dump/DumpContributor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpContributor.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpContributor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpContributorFactory.java b/src/main/java/org/elasticsearch/monitor/dump/DumpContributorFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpContributorFactory.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpContributorFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpException.java b/src/main/java/org/elasticsearch/monitor/dump/DumpException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpException.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpGenerationFailedException.java b/src/main/java/org/elasticsearch/monitor/dump/DumpGenerationFailedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpGenerationFailedException.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpGenerationFailedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpGenerator.java b/src/main/java/org/elasticsearch/monitor/dump/DumpGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpGenerator.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java b/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java rename to src/main/java/org/elasticsearch/monitor/dump/DumpMonitorService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/SimpleDump.java b/src/main/java/org/elasticsearch/monitor/dump/SimpleDump.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/SimpleDump.java rename to src/main/java/org/elasticsearch/monitor/dump/SimpleDump.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/SimpleDumpGenerator.java b/src/main/java/org/elasticsearch/monitor/dump/SimpleDumpGenerator.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/SimpleDumpGenerator.java rename to src/main/java/org/elasticsearch/monitor/dump/SimpleDumpGenerator.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java b/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java rename to src/main/java/org/elasticsearch/monitor/dump/cluster/ClusterDumpContributor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java b/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java rename to src/main/java/org/elasticsearch/monitor/dump/heap/HeapDumpContributor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java b/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java rename to src/main/java/org/elasticsearch/monitor/dump/summary/SummaryDumpContributor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java b/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java rename to src/main/java/org/elasticsearch/monitor/dump/thread/ThreadDumpContributor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java b/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java rename to src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java b/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java rename to src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java b/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java rename to src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java rename to src/main/java/org/elasticsearch/monitor/jvm/JvmService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java b/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java rename to src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java b/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java rename to src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java b/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java rename to src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java b/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java rename to src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java b/src/main/java/org/elasticsearch/monitor/network/NetworkService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java rename to src/main/java/org/elasticsearch/monitor/network/NetworkService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkStats.java b/src/main/java/org/elasticsearch/monitor/network/NetworkStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkStats.java rename to src/main/java/org/elasticsearch/monitor/network/NetworkStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java b/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java rename to src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java b/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java rename to src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/src/main/java/org/elasticsearch/monitor/os/OsInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsInfo.java rename to src/main/java/org/elasticsearch/monitor/os/OsInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/src/main/java/org/elasticsearch/monitor/os/OsProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsProbe.java rename to src/main/java/org/elasticsearch/monitor/os/OsProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java b/src/main/java/org/elasticsearch/monitor/os/OsService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java rename to src/main/java/org/elasticsearch/monitor/os/OsService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/src/main/java/org/elasticsearch/monitor/os/OsStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsStats.java rename to src/main/java/org/elasticsearch/monitor/os/OsStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java b/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java rename to src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java b/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java rename to src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java b/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java rename to src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java b/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java rename to src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/src/main/java/org/elasticsearch/monitor/process/ProcessService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java rename to src/main/java/org/elasticsearch/monitor/process/ProcessService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java b/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java rename to src/main/java/org/elasticsearch/monitor/process/ProcessStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java b/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java rename to src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java b/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java rename to src/main/java/org/elasticsearch/monitor/sigar/SigarService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/Node.java b/src/main/java/org/elasticsearch/node/Node.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/Node.java rename to src/main/java/org/elasticsearch/node/Node.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeBuilder.java b/src/main/java/org/elasticsearch/node/NodeBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeBuilder.java rename to src/main/java/org/elasticsearch/node/NodeBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeClosedException.java b/src/main/java/org/elasticsearch/node/NodeClosedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeClosedException.java rename to src/main/java/org/elasticsearch/node/NodeClosedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java b/src/main/java/org/elasticsearch/node/internal/InternalNode.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalNode.java rename to src/main/java/org/elasticsearch/node/internal/InternalNode.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalSettingsPerparer.java b/src/main/java/org/elasticsearch/node/internal/InternalSettingsPerparer.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalSettingsPerparer.java rename to src/main/java/org/elasticsearch/node/internal/InternalSettingsPerparer.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/NodeModule.java b/src/main/java/org/elasticsearch/node/internal/NodeModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/NodeModule.java rename to src/main/java/org/elasticsearch/node/internal/NodeModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/package-info.java b/src/main/java/org/elasticsearch/node/package-info.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/package-info.java rename to src/main/java/org/elasticsearch/node/package-info.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/service/NodeService.java b/src/main/java/org/elasticsearch/node/service/NodeService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/service/NodeService.java rename to src/main/java/org/elasticsearch/node/service/NodeService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java b/src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java rename to src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java b/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java rename to src/main/java/org/elasticsearch/plugins/AbstractPlugin.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java b/src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java rename to src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/Plugin.java b/src/main/java/org/elasticsearch/plugins/Plugin.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/Plugin.java rename to src/main/java/org/elasticsearch/plugins/Plugin.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginManager.java b/src/main/java/org/elasticsearch/plugins/PluginManager.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginManager.java rename to src/main/java/org/elasticsearch/plugins/PluginManager.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsModule.java b/src/main/java/org/elasticsearch/plugins/PluginsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsModule.java rename to src/main/java/org/elasticsearch/plugins/PluginsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsService.java b/src/main/java/org/elasticsearch/plugins/PluginsService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/PluginsService.java rename to src/main/java/org/elasticsearch/plugins/PluginsService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java b/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java rename to src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/AbstractRestResponse.java b/src/main/java/org/elasticsearch/rest/AbstractRestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/AbstractRestResponse.java rename to src/main/java/org/elasticsearch/rest/AbstractRestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/src/main/java/org/elasticsearch/rest/BaseRestHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/BaseRestHandler.java rename to src/main/java/org/elasticsearch/rest/BaseRestHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/src/main/java/org/elasticsearch/rest/BytesRestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/BytesRestResponse.java rename to src/main/java/org/elasticsearch/rest/BytesRestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestChannel.java b/src/main/java/org/elasticsearch/rest/RestChannel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestChannel.java rename to src/main/java/org/elasticsearch/rest/RestChannel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java b/src/main/java/org/elasticsearch/rest/RestController.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestController.java rename to src/main/java/org/elasticsearch/rest/RestController.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestHandler.java b/src/main/java/org/elasticsearch/rest/RestHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestHandler.java rename to src/main/java/org/elasticsearch/rest/RestHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java b/src/main/java/org/elasticsearch/rest/RestModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestModule.java rename to src/main/java/org/elasticsearch/rest/RestModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestRequest.java b/src/main/java/org/elasticsearch/rest/RestRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestRequest.java rename to src/main/java/org/elasticsearch/rest/RestRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestResponse.java b/src/main/java/org/elasticsearch/rest/RestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestResponse.java rename to src/main/java/org/elasticsearch/rest/RestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestStatus.java b/src/main/java/org/elasticsearch/rest/RestStatus.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/RestStatus.java rename to src/main/java/org/elasticsearch/rest/RestStatus.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/StringRestResponse.java b/src/main/java/org/elasticsearch/rest/StringRestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/StringRestResponse.java rename to src/main/java/org/elasticsearch/rest/StringRestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/Utf8RestResponse.java b/src/main/java/org/elasticsearch/rest/Utf8RestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/Utf8RestResponse.java rename to src/main/java/org/elasticsearch/rest/Utf8RestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/XContentRestResponse.java b/src/main/java/org/elasticsearch/rest/XContentRestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/XContentRestResponse.java rename to src/main/java/org/elasticsearch/rest/XContentRestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/XContentThrowableRestResponse.java b/src/main/java/org/elasticsearch/rest/XContentThrowableRestResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/XContentThrowableRestResponse.java rename to src/main/java/org/elasticsearch/rest/XContentThrowableRestResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/RestActionModule.java b/src/main/java/org/elasticsearch/rest/action/RestActionModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/RestActionModule.java rename to src/main/java/org/elasticsearch/rest/action/RestActionModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/broadcast/RestBroadcastPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/replication/RestReplicationPingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/ping/single/RestSinglePingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestGetIndicesAliasesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestGetIndicesAliasesAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestGetIndicesAliasesAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestGetIndicesAliasesAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/RestIndicesExistsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/RestIndicesExistsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/RestIndicesExistsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/exists/RestIndicesExistsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/gateway/snapshot/RestGatewaySnapshotAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/delete/RestDeleteMappingAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/delete/RestDeleteMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/delete/RestDeleteMappingAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/delete/RestDeleteMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java rename to src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java b/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java rename to src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java b/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java rename to src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java b/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java rename to src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java b/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java rename to src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java b/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java rename to src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java b/src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java rename to src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java rename to src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java b/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java rename to src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/quotes.json b/src/main/java/org/elasticsearch/rest/action/main/quotes.json similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/main/quotes.json rename to src/main/java/org/elasticsearch/rest/action/main/quotes.json diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java b/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java rename to src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java b/src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java rename to src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java rename to src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java rename to src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/support/RestActions.java b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/support/RestActions.java rename to src/main/java/org/elasticsearch/rest/action/support/RestActions.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java b/src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java rename to src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/support/AbstractRestRequest.java b/src/main/java/org/elasticsearch/rest/support/AbstractRestRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/support/AbstractRestRequest.java rename to src/main/java/org/elasticsearch/rest/support/AbstractRestRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/support/RestUtils.java b/src/main/java/org/elasticsearch/rest/support/RestUtils.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/rest/support/RestUtils.java rename to src/main/java/org/elasticsearch/rest/support/RestUtils.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/AbstractRiverComponent.java b/src/main/java/org/elasticsearch/river/AbstractRiverComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/AbstractRiverComponent.java rename to src/main/java/org/elasticsearch/river/AbstractRiverComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/River.java b/src/main/java/org/elasticsearch/river/River.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/River.java rename to src/main/java/org/elasticsearch/river/River.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverComponent.java b/src/main/java/org/elasticsearch/river/RiverComponent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverComponent.java rename to src/main/java/org/elasticsearch/river/RiverComponent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverException.java b/src/main/java/org/elasticsearch/river/RiverException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverException.java rename to src/main/java/org/elasticsearch/river/RiverException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverIndexName.java b/src/main/java/org/elasticsearch/river/RiverIndexName.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverIndexName.java rename to src/main/java/org/elasticsearch/river/RiverIndexName.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverModule.java b/src/main/java/org/elasticsearch/river/RiverModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverModule.java rename to src/main/java/org/elasticsearch/river/RiverModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverName.java b/src/main/java/org/elasticsearch/river/RiverName.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverName.java rename to src/main/java/org/elasticsearch/river/RiverName.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverNameModule.java b/src/main/java/org/elasticsearch/river/RiverNameModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverNameModule.java rename to src/main/java/org/elasticsearch/river/RiverNameModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverSettings.java b/src/main/java/org/elasticsearch/river/RiverSettings.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiverSettings.java rename to src/main/java/org/elasticsearch/river/RiverSettings.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversManager.java b/src/main/java/org/elasticsearch/river/RiversManager.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversManager.java rename to src/main/java/org/elasticsearch/river/RiversManager.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversModule.java b/src/main/java/org/elasticsearch/river/RiversModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversModule.java rename to src/main/java/org/elasticsearch/river/RiversModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversPluginsModule.java b/src/main/java/org/elasticsearch/river/RiversPluginsModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversPluginsModule.java rename to src/main/java/org/elasticsearch/river/RiversPluginsModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversService.java b/src/main/java/org/elasticsearch/river/RiversService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversService.java rename to src/main/java/org/elasticsearch/river/RiversService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversTypesRegistry.java b/src/main/java/org/elasticsearch/river/RiversTypesRegistry.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/RiversTypesRegistry.java rename to src/main/java/org/elasticsearch/river/RiversTypesRegistry.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java b/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java rename to src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java b/src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java rename to src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java b/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java rename to src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java b/src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java rename to src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java b/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java rename to src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java b/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java rename to src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java b/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java rename to src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/dummy/DummyRiver.java b/src/main/java/org/elasticsearch/river/dummy/DummyRiver.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/dummy/DummyRiver.java rename to src/main/java/org/elasticsearch/river/dummy/DummyRiver.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java b/src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java rename to src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/routing/RiverRouting.java b/src/main/java/org/elasticsearch/river/routing/RiverRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/routing/RiverRouting.java rename to src/main/java/org/elasticsearch/river/routing/RiverRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/routing/RiversRouter.java b/src/main/java/org/elasticsearch/river/routing/RiversRouter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/routing/RiversRouter.java rename to src/main/java/org/elasticsearch/river/routing/RiversRouter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/river/routing/RiversRouting.java b/src/main/java/org/elasticsearch/river/routing/RiversRouting.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/river/routing/RiversRouting.java rename to src/main/java/org/elasticsearch/river/routing/RiversRouting.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java b/src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java rename to src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractExecutableScript.java b/src/main/java/org/elasticsearch/script/AbstractExecutableScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractExecutableScript.java rename to src/main/java/org/elasticsearch/script/AbstractExecutableScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java b/src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java rename to src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java b/src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java rename to src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractSearchScript.java b/src/main/java/org/elasticsearch/script/AbstractSearchScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/AbstractSearchScript.java rename to src/main/java/org/elasticsearch/script/AbstractSearchScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/CompiledScript.java b/src/main/java/org/elasticsearch/script/CompiledScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/CompiledScript.java rename to src/main/java/org/elasticsearch/script/CompiledScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ExecutableScript.java b/src/main/java/org/elasticsearch/script/ExecutableScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/ExecutableScript.java rename to src/main/java/org/elasticsearch/script/ExecutableScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java b/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java rename to src/main/java/org/elasticsearch/script/NativeScriptEngineService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/NativeScriptFactory.java b/src/main/java/org/elasticsearch/script/NativeScriptFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/NativeScriptFactory.java rename to src/main/java/org/elasticsearch/script/NativeScriptFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptEngineService.java b/src/main/java/org/elasticsearch/script/ScriptEngineService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptEngineService.java rename to src/main/java/org/elasticsearch/script/ScriptEngineService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptException.java b/src/main/java/org/elasticsearch/script/ScriptException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptException.java rename to src/main/java/org/elasticsearch/script/ScriptException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptModule.java b/src/main/java/org/elasticsearch/script/ScriptModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptModule.java rename to src/main/java/org/elasticsearch/script/ScriptModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java rename to src/main/java/org/elasticsearch/script/ScriptService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/SearchScript.java b/src/main/java/org/elasticsearch/script/SearchScript.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/SearchScript.java rename to src/main/java/org/elasticsearch/script/SearchScript.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java b/src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java rename to src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/Scroll.java b/src/main/java/org/elasticsearch/search/Scroll.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/Scroll.java rename to src/main/java/org/elasticsearch/search/Scroll.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchContextException.java b/src/main/java/org/elasticsearch/search/SearchContextException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchContextException.java rename to src/main/java/org/elasticsearch/search/SearchContextException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchContextMissingException.java b/src/main/java/org/elasticsearch/search/SearchContextMissingException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchContextMissingException.java rename to src/main/java/org/elasticsearch/search/SearchContextMissingException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchException.java b/src/main/java/org/elasticsearch/search/SearchException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchException.java rename to src/main/java/org/elasticsearch/search/SearchException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java b/src/main/java/org/elasticsearch/search/SearchHit.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java rename to src/main/java/org/elasticsearch/search/SearchHit.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHitField.java b/src/main/java/org/elasticsearch/search/SearchHitField.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHitField.java rename to src/main/java/org/elasticsearch/search/SearchHitField.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHits.java b/src/main/java/org/elasticsearch/search/SearchHits.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHits.java rename to src/main/java/org/elasticsearch/search/SearchHits.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java b/src/main/java/org/elasticsearch/search/SearchModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java rename to src/main/java/org/elasticsearch/search/SearchModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseElement.java b/src/main/java/org/elasticsearch/search/SearchParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseElement.java rename to src/main/java/org/elasticsearch/search/SearchParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseException.java b/src/main/java/org/elasticsearch/search/SearchParseException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchParseException.java rename to src/main/java/org/elasticsearch/search/SearchParseException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchPhase.java b/src/main/java/org/elasticsearch/search/SearchPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchPhase.java rename to src/main/java/org/elasticsearch/search/SearchPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchPhaseResult.java b/src/main/java/org/elasticsearch/search/SearchPhaseResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchPhaseResult.java rename to src/main/java/org/elasticsearch/search/SearchPhaseResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java rename to src/main/java/org/elasticsearch/search/SearchService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchShardTarget.java b/src/main/java/org/elasticsearch/search/SearchShardTarget.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchShardTarget.java rename to src/main/java/org/elasticsearch/search/SearchShardTarget.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/TransportSearchModule.java b/src/main/java/org/elasticsearch/search/TransportSearchModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/TransportSearchModule.java rename to src/main/java/org/elasticsearch/search/TransportSearchModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceListener.java b/src/main/java/org/elasticsearch/search/action/SearchServiceListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceListener.java rename to src/main/java/org/elasticsearch/search/action/SearchServiceListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java b/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java rename to src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java rename to src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java rename to src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ScoreDocQueue.java b/src/main/java/org/elasticsearch/search/controller/ScoreDocQueue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ScoreDocQueue.java rename to src/main/java/org/elasticsearch/search/controller/ScoreDocQueue.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java b/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java rename to src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ShardDoc.java b/src/main/java/org/elasticsearch/search/controller/ShardDoc.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ShardDoc.java rename to src/main/java/org/elasticsearch/search/controller/ShardDoc.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ShardFieldDoc.java b/src/main/java/org/elasticsearch/search/controller/ShardFieldDoc.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ShardFieldDoc.java rename to src/main/java/org/elasticsearch/search/controller/ShardFieldDoc.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ShardScoreDoc.java b/src/main/java/org/elasticsearch/search/controller/ShardScoreDoc.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/ShardScoreDoc.java rename to src/main/java/org/elasticsearch/search/controller/ShardScoreDoc.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/count/CountSearchResult.java b/src/main/java/org/elasticsearch/search/count/CountSearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/count/CountSearchResult.java rename to src/main/java/org/elasticsearch/search/count/CountSearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java b/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java rename to src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java b/src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java rename to src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java rename to src/main/java/org/elasticsearch/search/dfs/DfsPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java b/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java rename to src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java rename to src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/AbstractFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/AbstractFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/AbstractFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/AbstractFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facet.java b/src/main/java/org/elasticsearch/search/facet/Facet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facet.java rename to src/main/java/org/elasticsearch/search/facet/Facet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetBinaryParseElement.java b/src/main/java/org/elasticsearch/search/facet/FacetBinaryParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetBinaryParseElement.java rename to src/main/java/org/elasticsearch/search/facet/FacetBinaryParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetBuilders.java b/src/main/java/org/elasticsearch/search/facet/FacetBuilders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetBuilders.java rename to src/main/java/org/elasticsearch/search/facet/FacetBuilders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetCollector.java b/src/main/java/org/elasticsearch/search/facet/FacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/FacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetModule.java b/src/main/java/org/elasticsearch/search/facet/FacetModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetModule.java rename to src/main/java/org/elasticsearch/search/facet/FacetModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java b/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetParseElement.java rename to src/main/java/org/elasticsearch/search/facet/FacetParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhase.java b/src/main/java/org/elasticsearch/search/facet/FacetPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhase.java rename to src/main/java/org/elasticsearch/search/facet/FacetPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhaseExecutionException.java b/src/main/java/org/elasticsearch/search/facet/FacetPhaseExecutionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhaseExecutionException.java rename to src/main/java/org/elasticsearch/search/facet/FacetPhaseExecutionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/FacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/FacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetProcessors.java b/src/main/java/org/elasticsearch/search/facet/FacetProcessors.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetProcessors.java rename to src/main/java/org/elasticsearch/search/facet/FacetProcessors.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facets.java b/src/main/java/org/elasticsearch/search/facet/Facets.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facets.java rename to src/main/java/org/elasticsearch/search/facet/Facets.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/InternalFacet.java b/src/main/java/org/elasticsearch/search/facet/InternalFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/InternalFacet.java rename to src/main/java/org/elasticsearch/search/facet/InternalFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/InternalFacets.java b/src/main/java/org/elasticsearch/search/facet/InternalFacets.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/InternalFacets.java rename to src/main/java/org/elasticsearch/search/facet/InternalFacets.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/OptimizeGlobalFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/OptimizeGlobalFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/OptimizeGlobalFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/OptimizeGlobalFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/SearchContextFacets.java b/src/main/java/org/elasticsearch/search/facet/SearchContextFacets.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/SearchContextFacets.java rename to src/main/java/org/elasticsearch/search/facet/SearchContextFacets.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/TransportFacetModule.java b/src/main/java/org/elasticsearch/search/facet/TransportFacetModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/TransportFacetModule.java rename to src/main/java/org/elasticsearch/search/facet/TransportFacetModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/CountDateHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/CountDateHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/CountDateHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/CountDateHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/DateHistogramFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalCountDateHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalCountDateHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalCountDateHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/InternalCountDateHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalDateHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalDateHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalDateHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/InternalDateHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalFullDateHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalFullDateHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/InternalFullDateHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/InternalFullDateHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/ValueDateHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/ValueDateHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/ValueDateHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/ValueDateHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/ValueScriptDateHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/datehistogram/ValueScriptDateHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/ValueScriptDateHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/datehistogram/ValueScriptDateHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java b/src/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java rename to src/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/filter/FilterFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/InternalFilterFacet.java b/src/main/java/org/elasticsearch/search/facet/filter/InternalFilterFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/InternalFilterFacet.java rename to src/main/java/org/elasticsearch/search/facet/filter/InternalFilterFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacet.java b/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacet.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/InternalGeoDistanceFacet.java b/src/main/java/org/elasticsearch/search/facet/geodistance/InternalGeoDistanceFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/InternalGeoDistanceFacet.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/InternalGeoDistanceFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/ScriptGeoDistanceFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/geodistance/ScriptGeoDistanceFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/ScriptGeoDistanceFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/ScriptGeoDistanceFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/ValueGeoDistanceFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/geodistance/ValueGeoDistanceFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/ValueGeoDistanceFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/geodistance/ValueGeoDistanceFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramScriptFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/histogram/HistogramScriptFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramScriptFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/histogram/HistogramScriptFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/InternalHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/histogram/InternalHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/InternalHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/histogram/InternalHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedCountHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedCountHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedCountHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedCountHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueScriptHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueScriptHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueScriptHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/bounded/BoundedValueScriptHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedCountHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedCountHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedCountHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedCountHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedFullHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedFullHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedFullHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/histogram/bounded/InternalBoundedFullHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/CountHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/CountHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/CountHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/CountHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/FullHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/FullHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/FullHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/FullHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalCountHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalCountHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalCountHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalCountHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalFullHistogramFacet.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalFullHistogramFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalFullHistogramFacet.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/InternalFullHistogramFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ScriptHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ScriptHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ScriptHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ScriptHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueScriptHistogramFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueScriptHistogramFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueScriptHistogramFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/histogram/unbounded/ValueScriptHistogramFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/InternalQueryFacet.java b/src/main/java/org/elasticsearch/search/facet/query/InternalQueryFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/InternalQueryFacet.java rename to src/main/java/org/elasticsearch/search/facet/query/InternalQueryFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacet.java b/src/main/java/org/elasticsearch/search/facet/query/QueryFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacet.java rename to src/main/java/org/elasticsearch/search/facet/query/QueryFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/query/QueryFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/query/QueryFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/query/QueryFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/query/QueryFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/InternalRangeFacet.java b/src/main/java/org/elasticsearch/search/facet/range/InternalRangeFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/InternalRangeFacet.java rename to src/main/java/org/elasticsearch/search/facet/range/InternalRangeFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacet.java b/src/main/java/org/elasticsearch/search/facet/range/RangeFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacet.java rename to src/main/java/org/elasticsearch/search/facet/range/RangeFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/range/RangeFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/range/RangeFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/range/RangeFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/range/RangeFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeScriptFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/range/RangeScriptFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeScriptFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/range/RangeScriptFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/ScriptRangeFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/range/ScriptRangeFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/ScriptRangeFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/range/ScriptRangeFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/InternalStatisticalFacet.java b/src/main/java/org/elasticsearch/search/facet/statistical/InternalStatisticalFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/InternalStatisticalFacet.java rename to src/main/java/org/elasticsearch/search/facet/statistical/InternalStatisticalFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/ScriptStatisticalFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/statistical/ScriptStatisticalFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/ScriptStatisticalFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/statistical/ScriptStatisticalFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacet.java b/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacet.java rename to src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalScriptFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalScriptFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalScriptFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/statistical/StatisticalScriptFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/InternalTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/InternalTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/InternalTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/InternalTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/TermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/TermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/terms/TermsFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/terms/TermsFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/bytes/InternalByteTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/bytes/InternalByteTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/bytes/InternalByteTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/bytes/InternalByteTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/bytes/TermsByteOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/doubles/InternalDoubleTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/doubles/InternalDoubleTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/doubles/InternalDoubleTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/doubles/InternalDoubleTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/doubles/TermsDoubleOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/floats/InternalFloatTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/floats/InternalFloatTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/floats/InternalFloatTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/floats/InternalFloatTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/floats/TermsFloatOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/index/IndexNameFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/index/IndexNameFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/index/IndexNameFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/index/IndexNameFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ints/InternalIntTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/ints/InternalIntTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ints/InternalIntTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/ints/InternalIntTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/ints/TermsIntOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ip/InternalIpTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/ip/InternalIpTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ip/InternalIpTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/ip/InternalIpTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/ip/TermsIpOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/longs/InternalLongTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/longs/InternalLongTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/longs/InternalLongTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/longs/InternalLongTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/longs/TermsLongOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/shorts/InternalShortTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/shorts/InternalShortTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/shorts/InternalShortTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/shorts/InternalShortTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/shorts/TermsShortOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/FieldsTermsStringFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/strings/FieldsTermsStringFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/FieldsTermsStringFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/strings/FieldsTermsStringFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/InternalStringTermsFacet.java b/src/main/java/org/elasticsearch/search/facet/terms/strings/InternalStringTermsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/InternalStringTermsFacet.java rename to src/main/java/org/elasticsearch/search/facet/terms/strings/InternalStringTermsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringOrdinalsFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringOrdinalsFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringOrdinalsFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/terms/strings/TermsStringOrdinalsFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/support/EntryPriorityQueue.java b/src/main/java/org/elasticsearch/search/facet/terms/support/EntryPriorityQueue.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/support/EntryPriorityQueue.java rename to src/main/java/org/elasticsearch/search/facet/terms/support/EntryPriorityQueue.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/InternalTermsStatsFacet.java b/src/main/java/org/elasticsearch/search/facet/termsstats/InternalTermsStatsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/InternalTermsStatsFacet.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/InternalTermsStatsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacet.java b/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacet.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetBuilder.java b/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetBuilder.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetProcessor.java b/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetProcessor.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetProcessor.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/TermsStatsFacetProcessor.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/doubles/InternalTermsStatsDoubleFacet.java b/src/main/java/org/elasticsearch/search/facet/termsstats/doubles/InternalTermsStatsDoubleFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/doubles/InternalTermsStatsDoubleFacet.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/doubles/InternalTermsStatsDoubleFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/doubles/TermsStatsDoubleFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/termsstats/doubles/TermsStatsDoubleFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/doubles/TermsStatsDoubleFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/doubles/TermsStatsDoubleFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/longs/InternalTermsStatsLongFacet.java b/src/main/java/org/elasticsearch/search/facet/termsstats/longs/InternalTermsStatsLongFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/longs/InternalTermsStatsLongFacet.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/longs/InternalTermsStatsLongFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/longs/TermsStatsLongFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/termsstats/longs/TermsStatsLongFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/longs/TermsStatsLongFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/longs/TermsStatsLongFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/strings/InternalTermsStatsStringFacet.java b/src/main/java/org/elasticsearch/search/facet/termsstats/strings/InternalTermsStatsStringFacet.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/strings/InternalTermsStatsStringFacet.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/strings/InternalTermsStatsStringFacet.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetCollector.java b/src/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetCollector.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetCollector.java rename to src/main/java/org/elasticsearch/search/facet/termsstats/strings/TermsStatsStringFacetCollector.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java rename to src/main/java/org/elasticsearch/search/fetch/FetchPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java b/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java rename to src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSearchRequest.java b/src/main/java/org/elasticsearch/search/fetch/FetchSearchRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSearchRequest.java rename to src/main/java/org/elasticsearch/search/fetch/FetchSearchRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java b/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java rename to src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java b/src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java rename to src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java rename to src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java rename to src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java b/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java rename to src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java b/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java rename to src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java rename to src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java b/src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java rename to src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/matchedfilters/MatchedFiltersFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/matchedfilters/MatchedFiltersFetchSubPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/matchedfilters/MatchedFiltersFetchSubPhase.java rename to src/main/java/org/elasticsearch/search/fetch/matchedfilters/MatchedFiltersFetchSubPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java rename to src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java rename to src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java rename to src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java rename to src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java b/src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java rename to src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java b/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java rename to src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightField.java b/src/main/java/org/elasticsearch/search/highlight/HighlightField.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightField.java rename to src/main/java/org/elasticsearch/search/highlight/HighlightField.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java rename to src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java b/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java rename to src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java b/src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java rename to src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java rename to src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java rename to src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java rename to src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java b/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java rename to src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java b/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java rename to src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java b/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java rename to src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java b/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java rename to src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchRequest.java b/src/main/java/org/elasticsearch/search/internal/InternalSearchRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchRequest.java rename to src/main/java/org/elasticsearch/search/internal/InternalSearchRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java b/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java rename to src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ScopePhase.java b/src/main/java/org/elasticsearch/search/internal/ScopePhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ScopePhase.java rename to src/main/java/org/elasticsearch/search/internal/ScopePhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/src/main/java/org/elasticsearch/search/internal/SearchContext.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java rename to src/main/java/org/elasticsearch/search/internal/SearchContext.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/DocLookup.java b/src/main/java/org/elasticsearch/search/lookup/DocLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/DocLookup.java rename to src/main/java/org/elasticsearch/search/lookup/DocLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java b/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java rename to src/main/java/org/elasticsearch/search/lookup/FieldLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java b/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java rename to src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java b/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java rename to src/main/java/org/elasticsearch/search/lookup/SearchLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java rename to src/main/java/org/elasticsearch/search/lookup/SourceLookup.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java b/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java rename to src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FilterParseElement.java b/src/main/java/org/elasticsearch/search/query/FilterParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FilterParseElement.java rename to src/main/java/org/elasticsearch/search/query/FilterParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java b/src/main/java/org/elasticsearch/search/query/FromParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java rename to src/main/java/org/elasticsearch/search/query/FromParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java b/src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java rename to src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java b/src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java rename to src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java b/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java rename to src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParseElement.java b/src/main/java/org/elasticsearch/search/query/QueryParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryParseElement.java rename to src/main/java/org/elasticsearch/search/query/QueryParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/src/main/java/org/elasticsearch/search/query/QueryPhase.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java rename to src/main/java/org/elasticsearch/search/query/QueryPhase.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java b/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java rename to src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java b/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java rename to src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java rename to src/main/java/org/elasticsearch/search/query/QuerySearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java b/src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java rename to src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java b/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java rename to src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/query/SizeParseElement.java b/src/main/java/org/elasticsearch/search/query/SizeParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/query/SizeParseElement.java rename to src/main/java/org/elasticsearch/search/query/SizeParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java rename to src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java rename to src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java b/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java rename to src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java rename to src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java rename to src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java b/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java rename to src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/src/main/java/org/elasticsearch/search/sort/SortBuilder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortBuilder.java rename to src/main/java/org/elasticsearch/search/sort/SortBuilder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/src/main/java/org/elasticsearch/search/sort/SortBuilders.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortBuilders.java rename to src/main/java/org/elasticsearch/search/sort/SortBuilders.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/src/main/java/org/elasticsearch/search/sort/SortOrder.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortOrder.java rename to src/main/java/org/elasticsearch/search/sort/SortOrder.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortParseElement.java b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortParseElement.java rename to src/main/java/org/elasticsearch/search/sort/SortParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortParser.java b/src/main/java/org/elasticsearch/search/sort/SortParser.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/SortParser.java rename to src/main/java/org/elasticsearch/search/sort/SortParser.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java b/src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java rename to src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPool.java rename to src/main/java/org/elasticsearch/threadpool/ThreadPool.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java b/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java rename to src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java b/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java rename to src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/src/main/java/org/elasticsearch/transport/ActionTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ActionTransportException.java rename to src/main/java/org/elasticsearch/transport/ActionTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ActionTransportRequestHandler.java b/src/main/java/org/elasticsearch/transport/ActionTransportRequestHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ActionTransportRequestHandler.java rename to src/main/java/org/elasticsearch/transport/ActionTransportRequestHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/BaseTransportRequestHandler.java b/src/main/java/org/elasticsearch/transport/BaseTransportRequestHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/BaseTransportRequestHandler.java rename to src/main/java/org/elasticsearch/transport/BaseTransportRequestHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java b/src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java rename to src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/BindTransportException.java b/src/main/java/org/elasticsearch/transport/BindTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/BindTransportException.java rename to src/main/java/org/elasticsearch/transport/BindTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/src/main/java/org/elasticsearch/transport/ConnectTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ConnectTransportException.java rename to src/main/java/org/elasticsearch/transport/ConnectTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/FailedCommunicationException.java b/src/main/java/org/elasticsearch/transport/FailedCommunicationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/FailedCommunicationException.java rename to src/main/java/org/elasticsearch/transport/FailedCommunicationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java b/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java rename to src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java b/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java rename to src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java b/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java rename to src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java b/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java rename to src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java b/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java rename to src/main/java/org/elasticsearch/transport/PlainTransportFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java b/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java rename to src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/RemoteTransportException.java b/src/main/java/org/elasticsearch/transport/RemoteTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/RemoteTransportException.java rename to src/main/java/org/elasticsearch/transport/RemoteTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java b/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java rename to src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java b/src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java rename to src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java b/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java rename to src/main/java/org/elasticsearch/transport/SendRequestTransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/Transport.java b/src/main/java/org/elasticsearch/transport/Transport.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/Transport.java rename to src/main/java/org/elasticsearch/transport/Transport.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportChannel.java b/src/main/java/org/elasticsearch/transport/TransportChannel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportChannel.java rename to src/main/java/org/elasticsearch/transport/TransportChannel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java b/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java rename to src/main/java/org/elasticsearch/transport/TransportConnectionListener.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportException.java b/src/main/java/org/elasticsearch/transport/TransportException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportException.java rename to src/main/java/org/elasticsearch/transport/TransportException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportFuture.java b/src/main/java/org/elasticsearch/transport/TransportFuture.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportFuture.java rename to src/main/java/org/elasticsearch/transport/TransportFuture.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportInfo.java b/src/main/java/org/elasticsearch/transport/TransportInfo.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportInfo.java rename to src/main/java/org/elasticsearch/transport/TransportInfo.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportModule.java b/src/main/java/org/elasticsearch/transport/TransportModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportModule.java rename to src/main/java/org/elasticsearch/transport/TransportModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java b/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java rename to src/main/java/org/elasticsearch/transport/TransportRequestHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java b/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java rename to src/main/java/org/elasticsearch/transport/TransportRequestOptions.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java b/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java rename to src/main/java/org/elasticsearch/transport/TransportResponseHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java b/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java rename to src/main/java/org/elasticsearch/transport/TransportResponseOptions.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportSerializationException.java b/src/main/java/org/elasticsearch/transport/TransportSerializationException.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportSerializationException.java rename to src/main/java/org/elasticsearch/transport/TransportSerializationException.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java rename to src/main/java/org/elasticsearch/transport/TransportService.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java b/src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java rename to src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java b/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportServiceManagement.java rename to src/main/java/org/elasticsearch/transport/TransportServiceManagement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportStats.java b/src/main/java/org/elasticsearch/transport/TransportStats.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportStats.java rename to src/main/java/org/elasticsearch/transport/TransportStats.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/VoidTransportResponseHandler.java b/src/main/java/org/elasticsearch/transport/VoidTransportResponseHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/VoidTransportResponseHandler.java rename to src/main/java/org/elasticsearch/transport/VoidTransportResponseHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransport.java b/src/main/java/org/elasticsearch/transport/local/LocalTransport.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransport.java rename to src/main/java/org/elasticsearch/transport/local/LocalTransport.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java b/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java rename to src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java b/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java rename to src/main/java/org/elasticsearch/transport/local/LocalTransportManagement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java b/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java rename to src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java b/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java rename to src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java rename to src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java b/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java rename to src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java b/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java rename to src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java rename to src/main/java/org/elasticsearch/transport/netty/NettyTransport.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java rename to src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java rename to src/main/java/org/elasticsearch/transport/netty/NettyTransportManagement.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java rename to src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/support/TransportStreams.java b/src/main/java/org/elasticsearch/transport/support/TransportStreams.java similarity index 100% rename from modules/elasticsearch/src/main/java/org/elasticsearch/transport/support/TransportStreams.java rename to src/main/java/org/elasticsearch/transport/support/TransportStreams.java diff --git a/modules/elasticsearch/src/main/java/config/names.txt b/src/main/resources/config/names.txt similarity index 100% rename from modules/elasticsearch/src/main/java/config/names.txt rename to src/main/resources/config/names.txt diff --git a/modules/elasticsearch/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java rename to src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java diff --git a/modules/elasticsearch/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java b/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java rename to src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java diff --git a/modules/elasticsearch/src/test/java/org/apache/lucene/index/memory/CustomMemoryIndexTests.java b/src/test/java/org/apache/lucene/index/memory/CustomMemoryIndexTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/apache/lucene/index/memory/CustomMemoryIndexTests.java rename to src/test/java/org/apache/lucene/index/memory/CustomMemoryIndexTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java b/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java rename to src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/VersionTests.java b/src/test/java/org/elasticsearch/VersionTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/VersionTests.java rename to src/test/java/org/elasticsearch/VersionTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/action/bulk/BulkActionTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkActionTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/action/bulk/BulkActionTests.java rename to src/test/java/org/elasticsearch/action/bulk/BulkActionTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json rename to src/test/java/org/elasticsearch/action/bulk/simple-bulk.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json rename to src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmarkTest.java b/src/test/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmarkTest.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmarkTest.java rename to src/test/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmarkTest.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java b/src/test/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/common/lucene/versioned/VersionedMapBenchmark.java b/src/test/java/org/elasticsearch/benchmark/common/lucene/versioned/VersionedMapBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/common/lucene/versioned/VersionedMapBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/common/lucene/versioned/VersionedMapBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java b/src/test/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java b/src/test/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java b/src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/percolator/EmbeddedPercolatorBenchmarkTest.java b/src/test/java/org/elasticsearch/benchmark/percolator/EmbeddedPercolatorBenchmarkTest.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/percolator/EmbeddedPercolatorBenchmarkTest.java rename to src/test/java/org/elasticsearch/benchmark/percolator/EmbeddedPercolatorBenchmarkTest.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/percolator/SinglePercolatorStressBenchmark.java b/src/test/java/org/elasticsearch/benchmark/percolator/SinglePercolatorStressBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/percolator/SinglePercolatorStressBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/percolator/SinglePercolatorStressBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/stress/NodesStressTest.java b/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/stress/NodesStressTest.java rename to src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java b/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java rename to src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java b/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java rename to src/test/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java b/src/test/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/BenchmarkMessage.java b/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessage.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/BenchmarkMessage.java rename to src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessage.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java b/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java rename to src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java b/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java b/src/test/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/trove/StringMapAdjustOrPutBenchmark.java b/src/test/java/org/elasticsearch/benchmark/trove/StringMapAdjustOrPutBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/trove/StringMapAdjustOrPutBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/trove/StringMapAdjustOrPutBenchmark.java diff --git a/modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java b/src/test/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java similarity index 100% rename from modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java rename to src/test/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java rename to src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java rename to src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java rename to src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java rename to src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/bloom/BoomFilterTests.java b/src/test/java/org/elasticsearch/common/bloom/BoomFilterTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/bloom/BoomFilterTests.java rename to src/test/java/org/elasticsearch/common/bloom/BoomFilterTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java b/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java rename to src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/src/test/java/org/elasticsearch/common/io/StreamsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/io/StreamsTests.java rename to src/test/java/org/elasticsearch/common/io/StreamsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java b/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java rename to src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java b/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java rename to src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java b/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java rename to src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java b/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java rename to src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/uid/UidFieldTests.java b/src/test/java/org/elasticsearch/common/lucene/uid/UidFieldTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/uid/UidFieldTests.java rename to src/test/java/org/elasticsearch/common/lucene/uid/UidFieldTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/AbstractVersionedMapTests.java b/src/test/java/org/elasticsearch/common/lucene/versioned/AbstractVersionedMapTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/AbstractVersionedMapTests.java rename to src/test/java/org/elasticsearch/common/lucene/versioned/AbstractVersionedMapTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMapTests.java b/src/test/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMapTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMapTests.java rename to src/test/java/org/elasticsearch/common/lucene/versioned/NativeVersionedMapTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/NonBlockingVersionedMapTests.java b/src/test/java/org/elasticsearch/common/lucene/versioned/NonBlockingVersionedMapTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/NonBlockingVersionedMapTests.java rename to src/test/java/org/elasticsearch/common/lucene/versioned/NonBlockingVersionedMapTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReaderTests.java b/src/test/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReaderTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReaderTests.java rename to src/test/java/org/elasticsearch/common/lucene/versioned/VersionedIndexReaderTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/path/PathTrieTests.java b/src/test/java/org/elasticsearch/common/path/PathTrieTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/path/PathTrieTests.java rename to src/test/java/org/elasticsearch/common/path/PathTrieTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java b/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java rename to src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/bar/BarTest.java b/src/test/java/org/elasticsearch/common/settings/bar/BarTest.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/bar/BarTest.java rename to src/test/java/org/elasticsearch/common/settings/bar/BarTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/foo/FooTest.java b/src/test/java/org/elasticsearch/common/settings/foo/FooTest.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/foo/FooTest.java rename to src/test/java/org/elasticsearch/common/settings/foo/FooTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java b/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java rename to src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java b/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java rename to src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json b/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json rename to src/test/java/org/elasticsearch/common/settings/loader/test-settings.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml b/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml rename to src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java b/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java rename to src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java rename to src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java b/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java rename to src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java rename to src/test/java/org/elasticsearch/common/unit/TimeValueTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/BlockingThreadPoolTest.java b/src/test/java/org/elasticsearch/common/util/concurrent/BlockingThreadPoolTest.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/BlockingThreadPoolTest.java rename to src/test/java/org/elasticsearch/common/util/concurrent/BlockingThreadPoolTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/ScalingThreadPoolTest.java b/src/test/java/org/elasticsearch/common/util/concurrent/ScalingThreadPoolTest.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/ScalingThreadPoolTest.java rename to src/test/java/org/elasticsearch/common/util/concurrent/ScalingThreadPoolTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/resource/AbstractAcquirableResourceTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/resource/AbstractAcquirableResourceTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/resource/AbstractAcquirableResourceTests.java rename to src/test/java/org/elasticsearch/common/util/concurrent/resource/AbstractAcquirableResourceTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResourceTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResourceTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResourceTests.java rename to src/test/java/org/elasticsearch/common/util/concurrent/resource/BlockingAcquirableResourceTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResourceTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResourceTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResourceTests.java rename to src/test/java/org/elasticsearch/common/util/concurrent/resource/NonBlockingAcquirableResourceTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java b/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java rename to src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java rename to src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java b/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java rename to src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java rename to src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java b/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java rename to src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java rename to src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/deps/lucene/LuceneFieldCacheTests.java b/src/test/java/org/elasticsearch/deps/lucene/LuceneFieldCacheTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/deps/lucene/LuceneFieldCacheTests.java rename to src/test/java/org/elasticsearch/deps/lucene/LuceneFieldCacheTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java b/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java rename to src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java rename to src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java b/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java rename to src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java b/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java rename to src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java rename to src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java rename to src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java b/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java rename to src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java b/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java rename to src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java b/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java rename to src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json rename to src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt rename to src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt rename to src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/test1.json b/src/test/java/org/elasticsearch/index/analysis/test1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/test1.json rename to src/test/java/org/elasticsearch/index/analysis/test1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/test1.yml b/src/test/java/org/elasticsearch/index/analysis/test1.yml similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/test1.yml rename to src/test/java/org/elasticsearch/index/analysis/test1.yml diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java b/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java rename to src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java rename to src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java rename to src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/AbstractSimpleEngineTests.java b/src/test/java/org/elasticsearch/index/engine/AbstractSimpleEngineTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/AbstractSimpleEngineTests.java rename to src/test/java/org/elasticsearch/index/engine/AbstractSimpleEngineTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java b/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java rename to src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java b/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java rename to src/test/java/org/elasticsearch/index/engine/robin/SimpleRobinEngineTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java b/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java rename to src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java b/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java rename to src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java b/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java rename to src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java b/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java rename to src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java b/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java rename to src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java b/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java rename to src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java b/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java rename to src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/MapperTests.java b/src/test/java/org/elasticsearch/index/mapper/MapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/MapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/MapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/mapping.json b/src/test/java/org/elasticsearch/index/mapper/all/mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/mapping.json rename to src/test/java/org/elasticsearch/index/mapper/all/mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json b/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/test1.json b/src/test/java/org/elasticsearch/index/mapper/all/test1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/all/test1.json rename to src/test/java/org/elasticsearch/index/mapper/all/test1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java b/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java rename to src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java b/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java rename to src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTempalteTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTempalteTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTempalteTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTempalteTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/geopoint/GeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geopoint/GeohashMappingGeoPointTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/geopoint/GeohashMappingGeoPointTests.java rename to src/test/java/org/elasticsearch/index/mapper/geopoint/GeohashMappingGeoPointTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonAndGeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonAndGeohashMappingGeoPointTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonAndGeohashMappingGeoPointTests.java rename to src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonAndGeohashMappingGeoPointTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonMappingGeoPointTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonMappingGeoPointTests.java rename to src/test/java/org/elasticsearch/index/mapper/geopoint/LatLonMappingGeoPointTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java b/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java rename to src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/merge/Test1MergeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/merge/Test1MergeMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/merge/Test1MergeMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/merge/Test1MergeMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/merge/stage1.json b/src/test/java/org/elasticsearch/index/mapper/merge/stage1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/merge/stage1.json rename to src/test/java/org/elasticsearch/index/mapper/merge/stage1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/merge/stage2.json b/src/test/java/org/elasticsearch/index/mapper/merge/stage2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/merge/stage2.json rename to src/test/java/org/elasticsearch/index/mapper/merge/stage2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java rename to src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json b/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java b/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java rename to src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json b/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json b/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test1.json b/src/test/java/org/elasticsearch/index/mapper/simple/test1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/simple/test1.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java rename to src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java rename to src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/percolator/PercolatorExecutorTests.java b/src/test/java/org/elasticsearch/index/percolator/PercolatorExecutorTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/percolator/PercolatorExecutorTests.java rename to src/test/java/org/elasticsearch/index/percolator/PercolatorExecutorTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java rename to src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/and-filter-named.json b/src/test/java/org/elasticsearch/index/query/and-filter-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/and-filter-named.json rename to src/test/java/org/elasticsearch/index/query/and-filter-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/and-filter.json b/src/test/java/org/elasticsearch/index/query/and-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/and-filter.json rename to src/test/java/org/elasticsearch/index/query/and-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/and-filter2.json b/src/test/java/org/elasticsearch/index/query/and-filter2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/and-filter2.json rename to src/test/java/org/elasticsearch/index/query/and-filter2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/bool-filter.json b/src/test/java/org/elasticsearch/index/query/bool-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/bool-filter.json rename to src/test/java/org/elasticsearch/index/query/bool-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/bool.json b/src/test/java/org/elasticsearch/index/query/bool.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/bool.json rename to src/test/java/org/elasticsearch/index/query/bool.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/boosting-query.json b/src/test/java/org/elasticsearch/index/query/boosting-query.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/boosting-query.json rename to src/test/java/org/elasticsearch/index/query/boosting-query.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/constantScore-query.json b/src/test/java/org/elasticsearch/index/query/constantScore-query.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/constantScore-query.json rename to src/test/java/org/elasticsearch/index/query/constantScore-query.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json b/src/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json rename to src/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/custom_score1.json b/src/test/java/org/elasticsearch/index/query/custom_score1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/custom_score1.json rename to src/test/java/org/elasticsearch/index/query/custom_score1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/data.json b/src/test/java/org/elasticsearch/index/query/data.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/data.json rename to src/test/java/org/elasticsearch/index/query/data.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/disMax.json b/src/test/java/org/elasticsearch/index/query/disMax.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/disMax.json rename to src/test/java/org/elasticsearch/index/query/disMax.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/disMax2.json b/src/test/java/org/elasticsearch/index/query/disMax2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/disMax2.json rename to src/test/java/org/elasticsearch/index/query/disMax2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/field1.json b/src/test/java/org/elasticsearch/index/query/field1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/field1.json rename to src/test/java/org/elasticsearch/index/query/field1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/field2.json b/src/test/java/org/elasticsearch/index/query/field2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/field2.json rename to src/test/java/org/elasticsearch/index/query/field2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/field3.json b/src/test/java/org/elasticsearch/index/query/field3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/field3.json rename to src/test/java/org/elasticsearch/index/query/field3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query.json b/src/test/java/org/elasticsearch/index/query/filtered-query.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query.json rename to src/test/java/org/elasticsearch/index/query/filtered-query.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query2.json b/src/test/java/org/elasticsearch/index/query/filtered-query2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query2.json rename to src/test/java/org/elasticsearch/index/query/filtered-query2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query3.json b/src/test/java/org/elasticsearch/index/query/filtered-query3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query3.json rename to src/test/java/org/elasticsearch/index/query/filtered-query3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query4.json b/src/test/java/org/elasticsearch/index/query/filtered-query4.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/filtered-query4.json rename to src/test/java/org/elasticsearch/index/query/filtered-query4.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fquery-filter.json b/src/test/java/org/elasticsearch/index/query/fquery-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fquery-filter.json rename to src/test/java/org/elasticsearch/index/query/fquery-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json b/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json rename to src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json b/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json rename to src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzy.json b/src/test/java/org/elasticsearch/index/query/fuzzy.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzy.json rename to src/test/java/org/elasticsearch/index/query/fuzzy.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json b/src/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json rename to src/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json b/src/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json rename to src/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance-named.json b/src/test/java/org/elasticsearch/index/query/geo_distance-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance-named.json rename to src/test/java/org/elasticsearch/index/query/geo_distance-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance1.json b/src/test/java/org/elasticsearch/index/query/geo_distance1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance1.json rename to src/test/java/org/elasticsearch/index/query/geo_distance1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance10.json b/src/test/java/org/elasticsearch/index/query/geo_distance10.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance10.json rename to src/test/java/org/elasticsearch/index/query/geo_distance10.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance11.json b/src/test/java/org/elasticsearch/index/query/geo_distance11.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance11.json rename to src/test/java/org/elasticsearch/index/query/geo_distance11.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance12.json b/src/test/java/org/elasticsearch/index/query/geo_distance12.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance12.json rename to src/test/java/org/elasticsearch/index/query/geo_distance12.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance2.json b/src/test/java/org/elasticsearch/index/query/geo_distance2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance2.json rename to src/test/java/org/elasticsearch/index/query/geo_distance2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance3.json b/src/test/java/org/elasticsearch/index/query/geo_distance3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance3.json rename to src/test/java/org/elasticsearch/index/query/geo_distance3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance4.json b/src/test/java/org/elasticsearch/index/query/geo_distance4.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance4.json rename to src/test/java/org/elasticsearch/index/query/geo_distance4.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance5.json b/src/test/java/org/elasticsearch/index/query/geo_distance5.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance5.json rename to src/test/java/org/elasticsearch/index/query/geo_distance5.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance6.json b/src/test/java/org/elasticsearch/index/query/geo_distance6.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance6.json rename to src/test/java/org/elasticsearch/index/query/geo_distance6.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance7.json b/src/test/java/org/elasticsearch/index/query/geo_distance7.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance7.json rename to src/test/java/org/elasticsearch/index/query/geo_distance7.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance8.json b/src/test/java/org/elasticsearch/index/query/geo_distance8.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance8.json rename to src/test/java/org/elasticsearch/index/query/geo_distance8.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance9.json b/src/test/java/org/elasticsearch/index/query/geo_distance9.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_distance9.json rename to src/test/java/org/elasticsearch/index/query/geo_distance9.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json b/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon1.json b/src/test/java/org/elasticsearch/index/query/geo_polygon1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon1.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon2.json b/src/test/java/org/elasticsearch/index/query/geo_polygon2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon2.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon3.json b/src/test/java/org/elasticsearch/index/query/geo_polygon3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon3.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon4.json b/src/test/java/org/elasticsearch/index/query/geo_polygon4.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/geo_polygon4.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon4.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java b/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java rename to src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java b/src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java rename to src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java b/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java rename to src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/limit-filter.json b/src/test/java/org/elasticsearch/index/query/limit-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/limit-filter.json rename to src/test/java/org/elasticsearch/index/query/limit-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/mapping.json b/src/test/java/org/elasticsearch/index/query/mapping.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/mapping.json rename to src/test/java/org/elasticsearch/index/query/mapping.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/matchAll.json b/src/test/java/org/elasticsearch/index/query/matchAll.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/matchAll.json rename to src/test/java/org/elasticsearch/index/query/matchAll.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/mlt.json b/src/test/java/org/elasticsearch/index/query/mlt.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/mlt.json rename to src/test/java/org/elasticsearch/index/query/mlt.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/mltField.json b/src/test/java/org/elasticsearch/index/query/mltField.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/mltField.json rename to src/test/java/org/elasticsearch/index/query/mltField.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/not-filter.json b/src/test/java/org/elasticsearch/index/query/not-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/not-filter.json rename to src/test/java/org/elasticsearch/index/query/not-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/not-filter2.json b/src/test/java/org/elasticsearch/index/query/not-filter2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/not-filter2.json rename to src/test/java/org/elasticsearch/index/query/not-filter2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/not-filter3.json b/src/test/java/org/elasticsearch/index/query/not-filter3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/not-filter3.json rename to src/test/java/org/elasticsearch/index/query/not-filter3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/numeric_range-filter.json b/src/test/java/org/elasticsearch/index/query/numeric_range-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/numeric_range-filter.json rename to src/test/java/org/elasticsearch/index/query/numeric_range-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/or-filter.json b/src/test/java/org/elasticsearch/index/query/or-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/or-filter.json rename to src/test/java/org/elasticsearch/index/query/or-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/or-filter2.json b/src/test/java/org/elasticsearch/index/query/or-filter2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/or-filter2.json rename to src/test/java/org/elasticsearch/index/query/or-filter2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java rename to src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java rename to src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java b/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java rename to src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java b/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java rename to src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-boost.json b/src/test/java/org/elasticsearch/index/query/prefix-boost.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-boost.json rename to src/test/java/org/elasticsearch/index/query/prefix-boost.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json b/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json rename to src/test/java/org/elasticsearch/index/query/prefix-filter-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-filter.json b/src/test/java/org/elasticsearch/index/query/prefix-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-filter.json rename to src/test/java/org/elasticsearch/index/query/prefix-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json b/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json rename to src/test/java/org/elasticsearch/index/query/prefix-with-boost.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix.json b/src/test/java/org/elasticsearch/index/query/prefix.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/prefix.json rename to src/test/java/org/elasticsearch/index/query/prefix.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields-match.json b/src/test/java/org/elasticsearch/index/query/query-fields-match.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields-match.json rename to src/test/java/org/elasticsearch/index/query/query-fields-match.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields1.json b/src/test/java/org/elasticsearch/index/query/query-fields1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields1.json rename to src/test/java/org/elasticsearch/index/query/query-fields1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields2.json b/src/test/java/org/elasticsearch/index/query/query-fields2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields2.json rename to src/test/java/org/elasticsearch/index/query/query-fields2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields3.json b/src/test/java/org/elasticsearch/index/query/query-fields3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-fields3.json rename to src/test/java/org/elasticsearch/index/query/query-fields3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-filter.json b/src/test/java/org/elasticsearch/index/query/query-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query-filter.json rename to src/test/java/org/elasticsearch/index/query/query-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query.json b/src/test/java/org/elasticsearch/index/query/query.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query.json rename to src/test/java/org/elasticsearch/index/query/query.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query2.json b/src/test/java/org/elasticsearch/index/query/query2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/query2.json rename to src/test/java/org/elasticsearch/index/query/query2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range-filter-named.json b/src/test/java/org/elasticsearch/index/query/range-filter-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range-filter-named.json rename to src/test/java/org/elasticsearch/index/query/range-filter-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range-filter.json b/src/test/java/org/elasticsearch/index/query/range-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range-filter.json rename to src/test/java/org/elasticsearch/index/query/range-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range.json b/src/test/java/org/elasticsearch/index/query/range.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range.json rename to src/test/java/org/elasticsearch/index/query/range.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range2.json b/src/test/java/org/elasticsearch/index/query/range2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/range2.json rename to src/test/java/org/elasticsearch/index/query/range2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanFirst.json b/src/test/java/org/elasticsearch/index/query/spanFirst.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanFirst.json rename to src/test/java/org/elasticsearch/index/query/spanFirst.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanNear.json b/src/test/java/org/elasticsearch/index/query/spanNear.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanNear.json rename to src/test/java/org/elasticsearch/index/query/spanNear.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanNot.json b/src/test/java/org/elasticsearch/index/query/spanNot.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanNot.json rename to src/test/java/org/elasticsearch/index/query/spanNot.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanOr.json b/src/test/java/org/elasticsearch/index/query/spanOr.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanOr.json rename to src/test/java/org/elasticsearch/index/query/spanOr.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanOr2.json b/src/test/java/org/elasticsearch/index/query/spanOr2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanOr2.json rename to src/test/java/org/elasticsearch/index/query/spanOr2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanTerm.json b/src/test/java/org/elasticsearch/index/query/spanTerm.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/spanTerm.json rename to src/test/java/org/elasticsearch/index/query/spanTerm.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term-filter-named.json b/src/test/java/org/elasticsearch/index/query/term-filter-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term-filter-named.json rename to src/test/java/org/elasticsearch/index/query/term-filter-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term-filter.json b/src/test/java/org/elasticsearch/index/query/term-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term-filter.json rename to src/test/java/org/elasticsearch/index/query/term-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term-with-boost.json b/src/test/java/org/elasticsearch/index/query/term-with-boost.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term-with-boost.json rename to src/test/java/org/elasticsearch/index/query/term-with-boost.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term.json b/src/test/java/org/elasticsearch/index/query/term.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/term.json rename to src/test/java/org/elasticsearch/index/query/term.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/terms-filter-named.json b/src/test/java/org/elasticsearch/index/query/terms-filter-named.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/terms-filter-named.json rename to src/test/java/org/elasticsearch/index/query/terms-filter-named.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/terms-filter.json b/src/test/java/org/elasticsearch/index/query/terms-filter.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/terms-filter.json rename to src/test/java/org/elasticsearch/index/query/terms-filter.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/terms-query.json b/src/test/java/org/elasticsearch/index/query/terms-query.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/terms-query.json rename to src/test/java/org/elasticsearch/index/query/terms-query.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text1.json b/src/test/java/org/elasticsearch/index/query/text1.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text1.json rename to src/test/java/org/elasticsearch/index/query/text1.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text2.json b/src/test/java/org/elasticsearch/index/query/text2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text2.json rename to src/test/java/org/elasticsearch/index/query/text2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text3.json b/src/test/java/org/elasticsearch/index/query/text3.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text3.json rename to src/test/java/org/elasticsearch/index/query/text3.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text4.json b/src/test/java/org/elasticsearch/index/query/text4.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text4.json rename to src/test/java/org/elasticsearch/index/query/text4.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text4_2.json b/src/test/java/org/elasticsearch/index/query/text4_2.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/text4_2.json rename to src/test/java/org/elasticsearch/index/query/text4_2.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/wildcard-boost.json b/src/test/java/org/elasticsearch/index/query/wildcard-boost.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/wildcard-boost.json rename to src/test/java/org/elasticsearch/index/query/wildcard-boost.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/query/wildcard.json b/src/test/java/org/elasticsearch/index/query/wildcard.json similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/query/wildcard.json rename to src/test/java/org/elasticsearch/index/query/wildcard.json diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java rename to src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java rename to src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java b/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java rename to src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java b/src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java rename to src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java b/src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java rename to src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/index/translog/fs/FsChannelSimpleTranslogTests.java b/src/test/java/org/elasticsearch/index/translog/fs/FsChannelSimpleTranslogTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/index/translog/fs/FsChannelSimpleTranslogTests.java rename to src/test/java/org/elasticsearch/index/translog/fs/FsChannelSimpleTranslogTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java b/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java rename to src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/script/NativeScriptTests.java b/src/test/java/org/elasticsearch/script/NativeScriptTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/script/NativeScriptTests.java rename to src/test/java/org/elasticsearch/script/NativeScriptTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java b/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java rename to src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java b/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java rename to src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.yml b/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.yml rename to src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java b/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java rename to src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml rename to src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/ClientTransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/test/integration/client/transport/ClientTransportTwoNodesSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/ClientTransportTwoNodesSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/client/transport/ClientTransportTwoNodesSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.java b/src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.java rename to src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.yml b/src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.yml rename to src/test/java/org/elasticsearch/test/integration/client/transport/DiscoveryTransportClientTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.java b/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.java rename to src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.yml rename to src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientDocumentActionsTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.java b/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.java rename to src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.yml b/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.yml rename to src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientMoreLikeThisActionTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.java b/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.java rename to src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.yml rename to src/test/java/org/elasticsearch/test/integration/client/transport/TransportClientSniffDocumentActionsTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java b/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java rename to src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java b/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java rename to src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java b/src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java rename to src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java b/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java rename to src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.yml rename to src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java b/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java rename to src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.yml rename to src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/GetActionTests.java b/src/test/java/org/elasticsearch/test/integration/document/GetActionTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/GetActionTests.java rename to src/test/java/org/elasticsearch/test/integration/document/GetActionTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.java b/src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.java rename to src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.yml rename to src/test/java/org/elasticsearch/test/integration/document/LocalDocumentActionsTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.java b/src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.java rename to src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.yml b/src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.yml rename to src/test/java/org/elasticsearch/test/integration/document/MoreLikeThisActionTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.yml b/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.yml rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.yml b/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.yml rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.yml b/src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.yml rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/FsMetaDataGatewayTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.yml b/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.yml rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.yml b/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.yml rename to src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java b/src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java rename to src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java rename to src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml rename to src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java b/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java b/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java b/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java b/src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java rename to src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java b/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java rename to src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java b/src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java rename to src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java rename to src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java rename to src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.java b/src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.java rename to src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.yml b/src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.yml rename to src/test/java/org/elasticsearch/test/integration/ping/PingActionTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java rename to src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java rename to src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java rename to src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java rename to src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java rename to src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java b/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java rename to src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java b/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java rename to src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java b/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java rename to src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java b/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java rename to src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java b/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java rename to src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java b/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java rename to src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java b/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java rename to src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.yml b/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.yml rename to src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardEmbeddedSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardEmbeddedSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardEmbeddedSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardEmbeddedSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardNoOptimizationEmbeddedSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardNoOptimizationEmbeddedSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardNoOptimizationEmbeddedSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/embedded/SingleShardNoOptimizationEmbeddedSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsEmbeddedSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsEmbeddedSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsEmbeddedSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsEmbeddedSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsUnbalancedShardsEmbeddedSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsUnbalancedShardsEmbeddedSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsUnbalancedShardsEmbeddedSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/embedded/ThreeShardsUnbalancedShardsEmbeddedSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java b/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java rename to src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java b/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java rename to src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java b/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java rename to src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java b/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java rename to src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java rename to src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java rename to src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java rename to src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml b/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml rename to src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java b/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java rename to src/test/java/org/elasticsearch/test/integration/search/matchedfilters/MatchedFiltersTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java b/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java rename to src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java rename to src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java b/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java rename to src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java b/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java rename to src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scriptfield/ScriptFieldSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/scriptfield/ScriptFieldSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scriptfield/ScriptFieldSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/scriptfield/ScriptFieldSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml b/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml rename to src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java b/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java rename to src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java rename to src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java rename to src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java b/src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java rename to src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java b/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java rename to src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java b/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java rename to src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java b/src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java rename to src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java b/src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java rename to src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/client/ClientFailover.java b/src/test/java/org/elasticsearch/test/stress/client/ClientFailover.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/client/ClientFailover.java rename to src/test/java/org/elasticsearch/test/stress/client/ClientFailover.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java b/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java rename to src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/gcbehavior/FilterCacheGcStress.java b/src/test/java/org/elasticsearch/test/stress/gcbehavior/FilterCacheGcStress.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/gcbehavior/FilterCacheGcStress.java rename to src/test/java/org/elasticsearch/test/stress/gcbehavior/FilterCacheGcStress.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/get/GetStressTest.java b/src/test/java/org/elasticsearch/test/stress/get/GetStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/get/GetStressTest.java rename to src/test/java/org/elasticsearch/test/stress/get/GetStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/get/MGetStress1.java b/src/test/java/org/elasticsearch/test/stress/get/MGetStress1.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/get/MGetStress1.java rename to src/test/java/org/elasticsearch/test/stress/get/MGetStress1.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java b/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java rename to src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/indexing/ConcurrentIndexingVersioningTest.java b/src/test/java/org/elasticsearch/test/stress/indexing/ConcurrentIndexingVersioningTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/indexing/ConcurrentIndexingVersioningTest.java rename to src/test/java/org/elasticsearch/test/stress/indexing/ConcurrentIndexingVersioningTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/leaks/GenericStatsLeak.java b/src/test/java/org/elasticsearch/test/stress/leaks/GenericStatsLeak.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/leaks/GenericStatsLeak.java rename to src/test/java/org/elasticsearch/test/stress/leaks/GenericStatsLeak.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/leaks/JvmStatsLeak.java b/src/test/java/org/elasticsearch/test/stress/leaks/JvmStatsLeak.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/leaks/JvmStatsLeak.java rename to src/test/java/org/elasticsearch/test/stress/leaks/JvmStatsLeak.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesRemoteStressTest.java b/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesRemoteStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesRemoteStressTest.java rename to src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesRemoteStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java b/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java rename to src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyNodesManyIndicesRecoveryStressTest.java b/src/test/java/org/elasticsearch/test/stress/manyindices/ManyNodesManyIndicesRecoveryStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyNodesManyIndicesRecoveryStressTest.java rename to src/test/java/org/elasticsearch/test/stress/manyindices/ManyNodesManyIndicesRecoveryStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/refresh/RefreshStressTest1.java b/src/test/java/org/elasticsearch/test/stress/refresh/RefreshStressTest1.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/refresh/RefreshStressTest1.java rename to src/test/java/org/elasticsearch/test/stress/refresh/RefreshStressTest1.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java b/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java rename to src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java b/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java rename to src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java b/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java similarity index 100% rename from modules/test/integration/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java rename to src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java b/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java rename to src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java b/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java rename to src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java b/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java rename to src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/util/StopWatchTests.java b/src/test/java/org/elasticsearch/util/StopWatchTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/util/StopWatchTests.java rename to src/test/java/org/elasticsearch/util/StopWatchTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/util/StringsTests.java b/src/test/java/org/elasticsearch/util/StringsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/util/StringsTests.java rename to src/test/java/org/elasticsearch/util/StringsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/util/ThreadLocalsTests.java b/src/test/java/org/elasticsearch/util/ThreadLocalsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/util/ThreadLocalsTests.java rename to src/test/java/org/elasticsearch/util/ThreadLocalsTests.java diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java b/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java similarity index 100% rename from modules/elasticsearch/src/test/java/org/elasticsearch/util/guice/InjectorsTests.java rename to src/test/java/org/elasticsearch/util/guice/InjectorsTests.java diff --git a/modules/benchmark/jmeter/jmx/index-count.jmx b/src/test/resources/jmeter/jmx/index-count.jmx similarity index 100% rename from modules/benchmark/jmeter/jmx/index-count.jmx rename to src/test/resources/jmeter/jmx/index-count.jmx diff --git a/modules/benchmark/jmeter/jmx/index-get.jmx b/src/test/resources/jmeter/jmx/index-get.jmx similarity index 100% rename from modules/benchmark/jmeter/jmx/index-get.jmx rename to src/test/resources/jmeter/jmx/index-get.jmx diff --git a/modules/benchmark/jmeter/jmx/index-search.jmx b/src/test/resources/jmeter/jmx/index-search.jmx similarity index 100% rename from modules/benchmark/jmeter/jmx/index-search.jmx rename to src/test/resources/jmeter/jmx/index-search.jmx diff --git a/modules/benchmark/jmeter/jmx/index.jmx b/src/test/resources/jmeter/jmx/index.jmx similarity index 100% rename from modules/benchmark/jmeter/jmx/index.jmx rename to src/test/resources/jmeter/jmx/index.jmx diff --git a/modules/benchmark/jmeter/jmx/ping-single.jmx b/src/test/resources/jmeter/jmx/ping-single.jmx similarity index 100% rename from modules/benchmark/jmeter/jmx/ping-single.jmx rename to src/test/resources/jmeter/jmx/ping-single.jmx