diff --git a/elasticsearch/license-plugin/keys/dev/public.key b/elasticsearch/keys/dev/public.key
similarity index 100%
rename from elasticsearch/license-plugin/keys/dev/public.key
rename to elasticsearch/keys/dev/public.key
diff --git a/elasticsearch/license-plugin/keys/prod/public.key b/elasticsearch/keys/prod/public.key
similarity index 100%
rename from elasticsearch/license-plugin/keys/prod/public.key
rename to elasticsearch/keys/prod/public.key
diff --git a/elasticsearch/license-plugin/.gitignore b/elasticsearch/license-plugin/.gitignore
deleted file mode 100644
index ab956abf6f9..00000000000
--- a/elasticsearch/license-plugin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/eclipse-build/
diff --git a/elasticsearch/license-plugin/src/test/resources/log4j.properties b/elasticsearch/license-plugin/src/test/resources/log4j.properties
deleted file mode 100644
index bad42d74b70..00000000000
--- a/elasticsearch/license-plugin/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-es.logger.level=DEBUG
-log4j.rootLogger=${es.logger.level}, out
-
-log4j.logger.org.apache.http=INFO, out
-log4j.additivity.org.apache.http=false
-
-log4j.logger.org.elasticsearch.license=TRACE
-
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.conversionPattern=[%d{ISO8601}][%-5p][%-25c] %m%n
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/CryptUtils.java b/elasticsearch/src/main/java/org/elasticsearch/license/CryptUtils.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/CryptUtils.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/CryptUtils.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DateUtils.java b/elasticsearch/src/main/java/org/elasticsearch/license/DateUtils.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DateUtils.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/DateUtils.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java b/elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java b/elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/ExpirationCallback.java b/elasticsearch/src/main/java/org/elasticsearch/license/ExpirationCallback.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/ExpirationCallback.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/ExpirationCallback.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequest.java b/elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseRequest.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequest.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseRequest.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseResponse.java b/elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseResponse.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseResponse.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/GetLicenseResponse.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/License.java b/elasticsearch/src/main/java/org/elasticsearch/license/License.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/License.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/License.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseService.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicenseService.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseService.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/LicenseService.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseUtils.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicenseUtils.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseUtils.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/LicenseUtils.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseVerifier.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicenseVerifier.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseVerifier.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/LicenseVerifier.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesMetaData.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicensesMetaData.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesMetaData.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/LicensesMetaData.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesStatus.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicensesStatus.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesStatus.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/LicensesStatus.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/Licensing.java b/elasticsearch/src/main/java/org/elasticsearch/license/Licensing.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/Licensing.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/Licensing.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensingClient.java b/elasticsearch/src/main/java/org/elasticsearch/license/LicensingClient.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensingClient.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/LicensingClient.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java b/elasticsearch/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequest.java b/elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseRequest.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequest.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseRequest.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseResponse.java b/elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseResponse.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseResponse.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/PutLicenseResponse.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java b/elasticsearch/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TrialLicense.java b/elasticsearch/src/main/java/org/elasticsearch/license/TrialLicense.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TrialLicense.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/TrialLicense.java
diff --git a/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/package-info.java b/elasticsearch/src/main/java/org/elasticsearch/license/package-info.java
similarity index 100%
rename from elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/package-info.java
rename to elasticsearch/src/main/java/org/elasticsearch/license/package-info.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseTribeTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseTribeTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseTribeTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseTribeTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesTransportTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/LicensesTransportTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesTransportTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/LicensesTransportTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TestUtils.java b/elasticsearch/src/test/java/org/elasticsearch/license/TestUtils.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TestUtils.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/TestUtils.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TrialLicenseTests.java b/elasticsearch/src/test/java/org/elasticsearch/license/TrialLicenseTests.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TrialLicenseTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/TrialLicenseTests.java
diff --git a/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java
similarity index 100%
rename from elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java
rename to elasticsearch/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java
diff --git a/elasticsearch/license-plugin/src/test/resources/private.key b/elasticsearch/src/test/resources/private.key
similarity index 100%
rename from elasticsearch/license-plugin/src/test/resources/private.key
rename to elasticsearch/src/test/resources/private.key
diff --git a/elasticsearch/license-plugin/src/test/resources/public.key b/elasticsearch/src/test/resources/public.key
similarity index 100%
rename from elasticsearch/license-plugin/src/test/resources/public.key
rename to elasticsearch/src/test/resources/public.key
diff --git a/elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json b/elasticsearch/src/test/resources/rest-api-spec/api/xpack.license.delete.json
similarity index 100%
rename from elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json
rename to elasticsearch/src/test/resources/rest-api-spec/api/xpack.license.delete.json
diff --git a/elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json b/elasticsearch/src/test/resources/rest-api-spec/api/xpack.license.get.json
similarity index 100%
rename from elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json
rename to elasticsearch/src/test/resources/rest-api-spec/api/xpack.license.get.json
diff --git a/elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json b/elasticsearch/src/test/resources/rest-api-spec/api/xpack.license.post.json
similarity index 100%
rename from elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json
rename to elasticsearch/src/test/resources/rest-api-spec/api/xpack.license.post.json
diff --git a/elasticsearch/license-plugin/src/test/resources/rest-api-spec/test/license/20_put_license.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/license/20_put_license.yaml
similarity index 100%
rename from elasticsearch/license-plugin/src/test/resources/rest-api-spec/test/license/20_put_license.yaml
rename to elasticsearch/src/test/resources/rest-api-spec/test/license/20_put_license.yaml