diff --git a/build.gradle b/build.gradle index ebffdb9973b..d67bd8f8977 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ import org.elasticsearch.gradle.VersionProperties +import org.elasticsearch.gradle.precommit.LicenseHeadersTask if (project.projectDir.name != 'x-plugins') { throw new GradleException('You must checkout x-plugins in a directory named x-plugins next to elasticsearch') @@ -39,3 +40,20 @@ task clean(type: Delete) { description = 'Deletes the build directory' delete 'build' } + +File checkstyleSuppressions = file('dev-tools/checkstyle_suppressions.xml') +subprojects { + tasks.withType(Checkstyle) { + inputs.file(checkstyleSuppressions) + // Use x-pack specific suppressions file rather than the open source one. + configProperties = [ + suppressions: checkstyleSuppressions + ] + } + + tasks.withType(LicenseHeadersTask.class) { + approvedLicenses = ['Elasticsearch Confidential'] + additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL' + } + ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-plugins:elasticsearch:x-pack' ] +} diff --git a/elasticsearch/checkstyle_suppressions.xml b/dev-tools/checkstyle_suppressions.xml similarity index 100% rename from elasticsearch/checkstyle_suppressions.xml rename to dev-tools/checkstyle_suppressions.xml diff --git a/elasticsearch/x-pack-transport/build.gradle b/elasticsearch-transport-client/build.gradle similarity index 100% rename from elasticsearch/x-pack-transport/build.gradle rename to elasticsearch-transport-client/build.gradle diff --git a/elasticsearch/x-pack-transport/src/main/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClient.java b/elasticsearch-transport-client/src/main/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClient.java similarity index 100% rename from elasticsearch/x-pack-transport/src/main/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClient.java rename to elasticsearch-transport-client/src/main/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClient.java diff --git a/elasticsearch/x-pack-transport/src/test/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClientTests.java b/elasticsearch-transport-client/src/test/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClientTests.java similarity index 100% rename from elasticsearch/x-pack-transport/src/test/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClientTests.java rename to elasticsearch-transport-client/src/test/java/org/elasticsearch/xpack/client/PreBuiltXPackTransportClientTests.java diff --git a/elasticsearch/x-pack/NOTICE.txt b/elasticsearch/NOTICE.txt similarity index 100% rename from elasticsearch/x-pack/NOTICE.txt rename to elasticsearch/NOTICE.txt diff --git a/elasticsearch/x-pack/bin/x-pack/.in.bat b/elasticsearch/bin/x-pack/.in.bat similarity index 100% rename from elasticsearch/x-pack/bin/x-pack/.in.bat rename to elasticsearch/bin/x-pack/.in.bat diff --git a/elasticsearch/x-pack/bin/x-pack/extension b/elasticsearch/bin/x-pack/extension similarity index 100% rename from elasticsearch/x-pack/bin/x-pack/extension rename to elasticsearch/bin/x-pack/extension diff --git a/elasticsearch/x-pack/bin/x-pack/extension.bat b/elasticsearch/bin/x-pack/extension.bat similarity index 100% rename from elasticsearch/x-pack/bin/x-pack/extension.bat rename to elasticsearch/bin/x-pack/extension.bat diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle index 991e7a7c26d..4359e78988a 100644 --- a/elasticsearch/build.gradle +++ b/elasticsearch/build.gradle @@ -1,18 +1,271 @@ -import org.elasticsearch.gradle.precommit.LicenseHeadersTask +import java.nio.charset.StandardCharsets +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.StandardCopyOption +import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.test.NodeInfo -File checkstyleSuppressions = file('checkstyle_suppressions.xml') -subprojects { - tasks.withType(Checkstyle) { - inputs.file(checkstyleSuppressions) - // Use x-pack specific suppressions file rather than the open source one. - configProperties = [ - suppressions: checkstyleSuppressions - ] - } +group 'org.elasticsearch.plugin' - tasks.withType(LicenseHeadersTask.class) { - approvedLicenses = ['Elasticsearch Confidential'] - additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL' - } - ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-plugins:elasticsearch:x-pack' ] +apply plugin: 'elasticsearch.esplugin' +esplugin { + name 'x-pack' + description 'Elasticsearch Expanded Pack Plugin' + classname 'org.elasticsearch.xpack.XPackPlugin' } + +ext.versions = [ + okhttp: '2.7.5' +] + +// TODO: fix this! https://github.com/elastic/x-plugins/issues/1066 +ext.compactProfile = 'full' + +dependencyLicenses.enabled = false + +licenseHeaders { + approvedLicenses << 'BCrypt (BSD-like)' + additionalLicense 'BCRYP', 'BCrypt (BSD-like)', 'Copyright (c) 2006 Damien Miller ' +} + +dependencies { + // security deps + compile project(path: ':modules:transport-netty3', configuration: 'runtime') + compile project(path: ':modules:transport-netty4', configuration: 'runtime') + compile 'dk.brics.automaton:automaton:1.11-8' + compile 'com.unboundid:unboundid-ldapsdk:3.1.1' + compile 'org.bouncycastle:bcprov-jdk15on:1.55' + compile 'org.bouncycastle:bcpkix-jdk15on:1.55' + testCompile 'com.google.jimfs:jimfs:1.1' + + // watcher deps + compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239' + compile 'com.google.guava:guava:16.0.1' // needed by watcher for the html sanitizer and security tests for jimfs + compile 'com.sun.mail:javax.mail:1.5.3' + // HACK: java 9 removed javax.activation from the default modules, so instead of trying to add modules, which would have + // to be conditionalized for java 8/9, we pull in the classes directly + compile 'javax.activation:activation:1.1' + + testCompile 'org.subethamail:subethasmtp:3.1.7' + // needed for subethasmtp, has @GuardedBy annotation + testCompile 'com.google.code.findbugs:jsr305:3.0.1' + + // monitoring deps + compile "org.elasticsearch.client:rest:${version}" + compile "org.elasticsearch.client:sniffer:${version}" + + // common test deps + testCompile 'org.elasticsearch:securemock:1.2' + testCompile 'org.slf4j:slf4j-log4j12:1.6.2' + testCompile 'org.slf4j:slf4j-api:1.6.2' + + // mock web server + testCompile "com.squareup.okhttp:mockwebserver:${versions.okhttp}" + testCompile "com.squareup.okhttp:okhttp:${versions.okhttp}" + testCompile "com.squareup.okhttp:okhttp-ws:${versions.okhttp}" + testCompile 'com.squareup.okio:okio:1.6.0' +} + +// we keep the source directories in the original structure of split plugins, +// in order to facilitate backports to 2.x. TODO: remove after 5.0 release +for (String module : ['', 'license-plugin/', 'security/', 'watcher/', 'monitoring/', 'graph/']) { + sourceSets { + main { + java.srcDir("${module}src/main/java") + resources.srcDir("${module}src/main/resources") + } + test { + java.srcDir("${module}src/test/java") + resources.srcDir("${module}src/test/resources") + } + } +} + +// make LicenseSigner available for testing signed licenses +sourceSets.test.java { + srcDir '../license-tools/src/main/java' +} + +compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" +compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" + +ext.expansions = [ + 'project.version': version, +] + +processResources { + from(sourceSets.main.resources.srcDirs) { + exclude '**/public.key' + inputs.properties(expansions) + MavenFilteringHack.filter(it, expansions) + } + boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true")) + if (snapshot) { + from 'license-plugin/keys/dev/public.key' + } else { + from 'license-plugin/keys/prod/public.key' + } +} + +forbiddenPatterns { + exclude '**/*.key' + exclude '**/*.p12' + exclude '**/*.der' + exclude '**/*.zip' +} + +// TODO: standardize packaging config for plugins +bundlePlugin { + from(project(':x-plugins').projectDir) { + include 'LICENSE.txt' + } + from(projectDir) { + include 'NOTICE.txt' + } + from('bin/x-pack') { + into 'bin' + } + from('security/bin/x-pack') { + into 'bin' + } + from('security/config/x-pack') { + into 'config' + } + from('watcher/bin/x-pack') { + into 'bin' + } +} + +// add api jar for extension authors to compile against +// note this is just the normal x-pack jar for now, with a different name +project.afterEvaluate { + task apiJar { + dependsOn('generatePomFileForApijarPublication', project.jar) + doFirst { + Path jarFile = project.jar.outputs.files.singleFile.toPath() + String apiFileName = jarFile.fileName.toString().replace(project.version, "api-${project.version}") + Files.copy(jarFile, jarFile.resolveSibling(apiFileName), StandardCopyOption.REPLACE_EXISTING) + + String pomFileName = jarFile.fileName.toString().replace('.jar', '.pom') + String apiPomFileName = apiFileName.replace('.jar', '.pom') + Files.copy(jarFile.resolveSibling(pomFileName), jarFile.resolveSibling(apiPomFileName), + StandardCopyOption.REPLACE_EXISTING) + } + } + assemble.dependsOn(apiJar) + project.publishing { + publications { + apijar(MavenPublication) { + from project.components.java + artifactId = artifactId + '-api' + pom.withXml { XmlProvider xml -> + Node root = xml.asNode() + root.appendNode('name', project.pluginProperties.extension.name) + root.appendNode('description', project.pluginProperties.extension.description) + } + } + } + } +} + +integTest { + // TODO: fix this rest test to not depend on a hardcoded port! + systemProperty 'tests.rest.blacklist', 'getting_started/10_monitor_cluster_health/*,bulk/10_basic/*' + cluster { + setting 'xpack.monitoring.collection.interval', '3s' + waitCondition = { NodeInfo node, AntBuilder ant -> + File tmpFile = new File(node.cwd, 'wait.success') + for (int i = 0; i < 10; i++) { + // we use custom wait logic here as the elastic user is not available immediately and ant.get will fail when a 401 is returned + HttpURLConnection httpURLConnection = null; + try { + httpURLConnection = (HttpURLConnection) new URL("http://${node.httpUri()}/_cluster/health?wait_for_nodes=${numNodes}").openConnection(); + httpURLConnection.setRequestProperty("Authorization", "Basic " + + Base64.getEncoder().encodeToString("elastic:changeme".getBytes(StandardCharsets.UTF_8))); + httpURLConnection.setRequestMethod("GET"); + httpURLConnection.connect(); + if (httpURLConnection.getResponseCode() == 200) { + tmpFile.withWriter StandardCharsets.UTF_8.name(), { + it.write(httpURLConnection.getInputStream().getText(StandardCharsets.UTF_8.name())) + } + } + } catch (Exception e) { + if (i == 9) { + logger.error("final attempt of calling cluster health failed", e) + } else { + logger.debug("failed to call cluster health", e) + } + } finally { + if (httpURLConnection != null) { + httpURLConnection.disconnect(); + } + } + + // did not start, so wait a bit before trying again + Thread.sleep(500L); + } + return tmpFile.exists() + } + } +} + +// TODO: don't publish test artifacts just to run messy tests, fix the tests! +// https://github.com/elastic/x-plugins/issues/724 +configurations { + testArtifacts.extendsFrom testRuntime +} +task testJar(type: Jar) { + classifier "test" + from sourceSets.test.output +} +artifacts { + // normal es plugins do not publish the jar but we need to since users need it for Transport Clients and extensions + archives jar + testArtifacts testJar +} + +// classes are missing, e.g. com.ibm.icu.lang.UCharacter +thirdPartyAudit.excludes = [ + // uses internal java api: sun.misc.Unsafe + 'com.google.common.cache.Striped64', + 'com.google.common.cache.Striped64$1', + 'com.google.common.cache.Striped64$Cell', + 'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator', + 'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1', + + // pulled in as external dependency to work on java 9 + 'com.sun.activation.registries.LineTokenizer', + 'com.sun.activation.registries.LogSupport', + 'com.sun.activation.registries.MailcapFile', + 'com.sun.activation.registries.MailcapParseException', + 'com.sun.activation.registries.MailcapTokenizer', + 'com.sun.activation.registries.MimeTypeEntry', + 'com.sun.activation.registries.MimeTypeFile', + 'javax.activation.ActivationDataFlavor', + 'javax.activation.CommandInfo', + 'javax.activation.CommandMap', + 'javax.activation.CommandObject', + 'javax.activation.DataContentHandler', + 'javax.activation.DataContentHandlerFactory', + 'javax.activation.DataHandler$1', + 'javax.activation.DataHandler', + 'javax.activation.DataHandlerDataSource', + 'javax.activation.DataSource', + 'javax.activation.DataSourceDataContentHandler', + 'javax.activation.FileDataSource', + 'javax.activation.FileTypeMap', + 'javax.activation.MailcapCommandMap', + 'javax.activation.MimeType', + 'javax.activation.MimeTypeParameterList', + 'javax.activation.MimeTypeParseException', + 'javax.activation.MimetypesFileTypeMap', + 'javax.activation.ObjectDataContentHandler', + 'javax.activation.SecuritySupport$1', + 'javax.activation.SecuritySupport$2', + 'javax.activation.SecuritySupport$3', + 'javax.activation.SecuritySupport$4', + 'javax.activation.SecuritySupport$5', + 'javax.activation.SecuritySupport', + 'javax.activation.URLDataSource', + 'javax.activation.UnsupportedDataTypeException' +] diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java b/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java similarity index 100% rename from elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java rename to elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java diff --git a/elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java b/elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java similarity index 100% rename from elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java rename to elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java diff --git a/elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java b/elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java similarity index 100% rename from elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java rename to elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java diff --git a/elasticsearch/x-pack/graph/src/test/resources/rest-api-spec/api/xpack.graph.explore.json b/elasticsearch/graph/src/test/resources/rest-api-spec/api/xpack.graph.explore.json similarity index 100% rename from elasticsearch/x-pack/graph/src/test/resources/rest-api-spec/api/xpack.graph.explore.json rename to elasticsearch/graph/src/test/resources/rest-api-spec/api/xpack.graph.explore.json diff --git a/elasticsearch/x-pack/graph/src/test/resources/rest-api-spec/test/graph/10_basic.yaml b/elasticsearch/graph/src/test/resources/rest-api-spec/test/graph/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/graph/src/test/resources/rest-api-spec/test/graph/10_basic.yaml rename to elasticsearch/graph/src/test/resources/rest-api-spec/test/graph/10_basic.yaml diff --git a/elasticsearch/x-pack/license-plugin/.gitignore b/elasticsearch/license-plugin/.gitignore similarity index 100% rename from elasticsearch/x-pack/license-plugin/.gitignore rename to elasticsearch/license-plugin/.gitignore diff --git a/elasticsearch/license-tools/src/test/resources/public.key b/elasticsearch/license-plugin/keys/dev/public.key similarity index 100% rename from elasticsearch/license-tools/src/test/resources/public.key rename to elasticsearch/license-plugin/keys/dev/public.key diff --git a/elasticsearch/x-pack/license-plugin/keys/prod/public.key b/elasticsearch/license-plugin/keys/prod/public.key similarity index 100% rename from elasticsearch/x-pack/license-plugin/keys/prod/public.key rename to elasticsearch/license-plugin/keys/prod/public.key diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/CryptUtils.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/CryptUtils.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/CryptUtils.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/CryptUtils.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DateUtils.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DateUtils.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DateUtils.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DateUtils.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequest.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/DeleteLicenseResponse.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/ExpirationCallback.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/ExpirationCallback.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/ExpirationCallback.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/ExpirationCallback.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequest.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequest.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequest.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequest.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseRequestBuilder.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseResponse.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseResponse.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseResponse.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/GetLicenseResponse.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/License.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/License.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicenseService.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseService.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicenseService.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseService.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicenseUtils.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseUtils.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicenseUtils.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseUtils.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicenseVerifier.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseVerifier.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicenseVerifier.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicenseVerifier.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicensesMetaData.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesMetaData.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicensesMetaData.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesMetaData.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicensesStatus.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesStatus.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicensesStatus.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensesStatus.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/Licensing.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/Licensing.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/Licensing.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/Licensing.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicensingClient.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensingClient.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/LicensingClient.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/LicensingClient.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/OperationModeFileWatcher.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequest.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequest.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequest.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequest.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseRequestBuilder.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseResponse.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseResponse.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseResponse.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/PutLicenseResponse.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportDeleteLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportGetLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TransportPutLicenseAction.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TrialLicense.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TrialLicense.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/TrialLicense.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/TrialLicense.java diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/package-info.java b/elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/package-info.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/package-info.java rename to elasticsearch/license-plugin/src/main/java/org/elasticsearch/license/package-info.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicenseServiceTestCase.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/AbstractLicensesIntegrationTestCase.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseClusterChangeTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseOperationModeUpdateTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseRegistrationTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseSerializationTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseServiceClusterTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseTribeTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseTribeTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseTribeTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseTribeTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicenseUtilsTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesTransportTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesTransportTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/LicensesTransportTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/LicensesTransportTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/OperationModeFileWatcherTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/PutLicenseResponseTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/TestUtils.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TestUtils.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/TestUtils.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TestUtils.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/TrialLicenseTests.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TrialLicenseTests.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/TrialLicenseTests.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TrialLicenseTests.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java b/elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java rename to elasticsearch/license-plugin/src/test/java/org/elasticsearch/license/TribeTransportTestCase.java diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/log4j.properties b/elasticsearch/license-plugin/src/test/resources/log4j.properties similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/log4j.properties rename to elasticsearch/license-plugin/src/test/resources/log4j.properties diff --git a/elasticsearch/license-tools/src/test/resources/private.key b/elasticsearch/license-plugin/src/test/resources/private.key similarity index 100% rename from elasticsearch/license-tools/src/test/resources/private.key rename to elasticsearch/license-plugin/src/test/resources/private.key diff --git a/elasticsearch/x-pack/license-plugin/keys/dev/public.key b/elasticsearch/license-plugin/src/test/resources/public.key similarity index 100% rename from elasticsearch/x-pack/license-plugin/keys/dev/public.key rename to elasticsearch/license-plugin/src/test/resources/public.key diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json b/elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json rename to elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json b/elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json rename to elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json b/elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json rename to elasticsearch/license-plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/test/license/20_put_license.yaml b/elasticsearch/license-plugin/src/test/resources/rest-api-spec/test/license/20_put_license.yaml similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/rest-api-spec/test/license/20_put_license.yaml rename to elasticsearch/license-plugin/src/test/resources/rest-api-spec/test/license/20_put_license.yaml diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/AgentService.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/AgentService.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/AgentService.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/AgentService.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoredSystem.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoredSystem.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoredSystem.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoredSystem.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringSettings.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringSettings.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringSettings.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringSettings.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkAction.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkAction.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkAction.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkAction.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestBuilder.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestBuilder.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestBuilder.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponse.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponse.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponse.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponse.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndex.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndex.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndex.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndex.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkAction.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkAction.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkAction.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkAction.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/client/MonitoringClient.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/client/MonitoringClient.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/client/MonitoringClient.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/client/MonitoringClient.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/Collector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/Collector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/Collector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/Collector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterInfoMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterInfoMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterInfoMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterInfoMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateNodeMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateNodeMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateNodeMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateNodeMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/DiscoveryNodeMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/DiscoveryNodeMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/DiscoveryNodeMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/DiscoveryNodeMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardMonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardMonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardMonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardMonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportBulk.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportBulk.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportBulk.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportBulk.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportException.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportException.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportException.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ExportException.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporter.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporter.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporter.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporter.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDoc.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDoc.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDoc.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDoc.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtils.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtils.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtils.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtils.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/BackwardsCompatibilityAliasesResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/BackwardsCompatibilityAliasesResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/BackwardsCompatibilityAliasesResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/BackwardsCompatibilityAliasesResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulk.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulk.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulk.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulk.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListener.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListener.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListener.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListener.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilder.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilder.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilder.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilder.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListener.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListener.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListener.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListener.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/Scheme.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/Scheme.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/Scheme.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/Scheme.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallback.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallback.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallback.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallback.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallback.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallback.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallback.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallback.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResource.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResource.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalBulk.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalBulk.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalBulk.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalBulk.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/ResolversRegistry.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/ResolversRegistry.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/ResolversRegistry.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/ResolversRegistry.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/DiscoveryNodeResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/DiscoveryNodeResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/DiscoveryNodeResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/cluster/DiscoveryNodeResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolver.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolver.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolver.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolver.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/MonitoringRestHandler.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/MonitoringRestHandler.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/MonitoringRestHandler.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/MonitoringRestHandler.java diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java b/elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java rename to elasticsearch/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java diff --git a/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-data.json b/elasticsearch/monitoring/src/main/resources/monitoring-data.json similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/resources/monitoring-data.json rename to elasticsearch/monitoring/src/main/resources/monitoring-data.json diff --git a/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json b/elasticsearch/monitoring/src/main/resources/monitoring-es.json similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json rename to elasticsearch/monitoring/src/main/resources/monitoring-es.json diff --git a/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-kibana.json b/elasticsearch/monitoring/src/main/resources/monitoring-kibana.json similarity index 100% rename from elasticsearch/x-pack/monitoring/src/main/resources/monitoring-kibana.json rename to elasticsearch/monitoring/src/main/resources/monitoring-kibana.json diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTestUtils.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTestUtils.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTestUtils.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTestUtils.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsIntegTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsIntegTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsIntegTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsIntegTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringSettingsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringTribeTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringTribeTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringTribeTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringTribeTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDocTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDocTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDocTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkDocTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequestTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponseTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponseTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponseTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkResponseTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndexTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndexTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndexTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/MonitoringIndexTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkActionTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkActionTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkActionTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkActionTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/AbstractIndicesCleanerTestCase.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/AbstractIndicesCleanerTestCase.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/AbstractIndicesCleanerTestCase.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/AbstractIndicesCleanerTestCase.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerServiceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerServiceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerServiceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerServiceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/local/LocalIndicesCleanerTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/local/LocalIndicesCleanerTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/local/LocalIndicesCleanerTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/cleaner/local/LocalIndicesCleanerTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStateCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndicesStatsCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollectorTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollectorTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollectorTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollectorTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/AbstractExporterTemplateTestCase.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/AbstractExporterTemplateTestCase.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/AbstractExporterTemplateTestCase.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/AbstractExporterTemplateTestCase.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDocTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDocTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDocTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringDocTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtilsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtilsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtilsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/AbstractPublishableHttpResourceTestCase.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/AbstractPublishableHttpResourceTestCase.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/AbstractPublishableHttpResourceTestCase.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/AbstractPublishableHttpResourceTestCase.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListenerTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListenerTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListenerTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListenerTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilderTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilderTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilderTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpHostBuilderTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockHttpResource.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockHttpResource.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockHttpResource.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockHttpResource.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockWebServerContainer.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockWebServerContainer.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockWebServerContainer.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MockWebServerContainer.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/MultiHttpResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListenerTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListenerTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListenerTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/NodeFailureListenerTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PipelineHttpResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SchemeTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SchemeTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SchemeTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SchemeTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallbackTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallbackTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallbackTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/SecurityHttpClientConfigCallbackTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TemplateHttpResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallbackTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallbackTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallbackTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/TimeoutRequestConfigCallbackTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResourceTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResourceTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResourceTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/VersionHttpResourceTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/DataResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/DataResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/DataResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/DataResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolverTestCase.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolverTestCase.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolverTestCase.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/MonitoringIndexNameResolverTestCase.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/TimestampedResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/TimestampedResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/TimestampedResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/TimestampedResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkDataResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/bulk/MonitoringBulkTimestampedResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateNodeResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStateTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterStatsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexRecoveryTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndexStatsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/indices/IndicesStatsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/DiscoveryNodeResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/DiscoveryNodeResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/DiscoveryNodeResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/DiscoveryNodeResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/MultiNodesStatsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/MultiNodesStatsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/MultiNodesStatsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/MultiNodesStatsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolverTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolverTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsResolverTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/resolver/shards/ShardsTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringInternalClientTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringInternalClientTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringInternalClientTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringInternalClientTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringSettingsFilterTests.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringSettingsFilterTests.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringSettingsFilterTests.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/security/MonitoringSettingsFilterTests.java diff --git a/elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java b/elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java rename to elasticsearch/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java diff --git a/elasticsearch/x-pack/monitoring/src/test/resources/log4j.properties b/elasticsearch/monitoring/src/test/resources/log4j.properties similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/resources/log4j.properties rename to elasticsearch/monitoring/src/test/resources/log4j.properties diff --git a/elasticsearch/x-pack/monitoring/src/test/resources/monitoring-test.json b/elasticsearch/monitoring/src/test/resources/monitoring-test.json similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/resources/monitoring-test.json rename to elasticsearch/monitoring/src/test/resources/monitoring-test.json diff --git a/elasticsearch/x-pack/monitoring/src/test/resources/rest-api-spec/api/xpack.monitoring.bulk.json b/elasticsearch/monitoring/src/test/resources/rest-api-spec/api/xpack.monitoring.bulk.json similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/resources/rest-api-spec/api/xpack.monitoring.bulk.json rename to elasticsearch/monitoring/src/test/resources/rest-api-spec/api/xpack.monitoring.bulk.json diff --git a/elasticsearch/x-pack/monitoring/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yaml b/elasticsearch/monitoring/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/monitoring/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yaml rename to elasticsearch/monitoring/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yaml diff --git a/elasticsearch/x-pack/security/README.asciidoc b/elasticsearch/security/README.asciidoc similarity index 100% rename from elasticsearch/x-pack/security/README.asciidoc rename to elasticsearch/security/README.asciidoc diff --git a/elasticsearch/x-pack/security/TESTING.asciidoc b/elasticsearch/security/TESTING.asciidoc similarity index 100% rename from elasticsearch/x-pack/security/TESTING.asciidoc rename to elasticsearch/security/TESTING.asciidoc diff --git a/elasticsearch/x-pack/security/bin/x-pack/certgen b/elasticsearch/security/bin/x-pack/certgen similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/certgen rename to elasticsearch/security/bin/x-pack/certgen diff --git a/elasticsearch/x-pack/security/bin/x-pack/certgen.bat b/elasticsearch/security/bin/x-pack/certgen.bat similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/certgen.bat rename to elasticsearch/security/bin/x-pack/certgen.bat diff --git a/elasticsearch/x-pack/security/bin/x-pack/migrate b/elasticsearch/security/bin/x-pack/migrate similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/migrate rename to elasticsearch/security/bin/x-pack/migrate diff --git a/elasticsearch/x-pack/security/bin/x-pack/migrate.bat b/elasticsearch/security/bin/x-pack/migrate.bat similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/migrate.bat rename to elasticsearch/security/bin/x-pack/migrate.bat diff --git a/elasticsearch/x-pack/security/bin/x-pack/syskeygen b/elasticsearch/security/bin/x-pack/syskeygen similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/syskeygen rename to elasticsearch/security/bin/x-pack/syskeygen diff --git a/elasticsearch/x-pack/security/bin/x-pack/syskeygen.bat b/elasticsearch/security/bin/x-pack/syskeygen.bat similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/syskeygen.bat rename to elasticsearch/security/bin/x-pack/syskeygen.bat diff --git a/elasticsearch/x-pack/security/bin/x-pack/users b/elasticsearch/security/bin/x-pack/users similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/users rename to elasticsearch/security/bin/x-pack/users diff --git a/elasticsearch/x-pack/security/bin/x-pack/users.bat b/elasticsearch/security/bin/x-pack/users.bat similarity index 100% rename from elasticsearch/x-pack/security/bin/x-pack/users.bat rename to elasticsearch/security/bin/x-pack/users.bat diff --git a/elasticsearch/x-pack/security/config/x-pack/log4j2.properties b/elasticsearch/security/config/x-pack/log4j2.properties similarity index 100% rename from elasticsearch/x-pack/security/config/x-pack/log4j2.properties rename to elasticsearch/security/config/x-pack/log4j2.properties diff --git a/elasticsearch/x-pack/security/config/x-pack/role_mapping.yml b/elasticsearch/security/config/x-pack/role_mapping.yml similarity index 100% rename from elasticsearch/x-pack/security/config/x-pack/role_mapping.yml rename to elasticsearch/security/config/x-pack/role_mapping.yml diff --git a/elasticsearch/x-pack/security/config/x-pack/roles.yml b/elasticsearch/security/config/x-pack/roles.yml similarity index 100% rename from elasticsearch/x-pack/security/config/x-pack/roles.yml rename to elasticsearch/security/config/x-pack/roles.yml diff --git a/elasticsearch/x-pack/security/config/x-pack/users b/elasticsearch/security/config/x-pack/users similarity index 100% rename from elasticsearch/x-pack/security/config/x-pack/users rename to elasticsearch/security/config/x-pack/users diff --git a/elasticsearch/x-pack/security/config/x-pack/users_roles b/elasticsearch/security/config/x-pack/users_roles similarity index 100% rename from elasticsearch/x-pack/security/config/x-pack/users_roles rename to elasticsearch/security/config/x-pack/users_roles diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/InternalClient.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/InternalClient.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/InternalClient.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/InternalClient.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/Security.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/Security.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/Security.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/Security.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityContext.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityContext.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityContext.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityContext.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityFeatureSet.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityFeatureSet.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityFeatureSet.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityFeatureSet.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityLifecycleService.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityLifecycleService.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityLifecycleService.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityLifecycleService.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityTemplateService.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityTemplateService.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/SecurityTemplateService.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/SecurityTemplateService.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionModule.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionModule.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionModule.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionModule.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/BulkRequestInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/BulkRequestInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/BulkRequestInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/BulkRequestInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldStatsRequestInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldStatsRequestInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldStatsRequestInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/FieldStatsRequestInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/RequestInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/RequestInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/RequestInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/RequestInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/SearchRequestInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/SearchRequestInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/SearchRequestInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/SearchRequestInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/UpdateRequestInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/UpdateRequestInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/UpdateRequestInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/interceptor/UpdateRequestInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/ClearRealmCacheResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/ClearRolesCacheResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportClearRolesCacheAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequestBuilder.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequestBuilder.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequestBuilder.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledResponse.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledResponse.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledResponse.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledResponse.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportPutUserAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportPutUserAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportPutUserAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportPutUserAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/UserRequest.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/UserRequest.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/user/UserRequest.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/action/user/UserRequest.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditLevel.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditLevel.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditLevel.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditLevel.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrail.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrail.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrail.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrail.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrail.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexNameResolver.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexNameResolver.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexNameResolver.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexNameResolver.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/Authentication.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/Authentication.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/Authentication.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/Authentication.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationFailureHandler.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationFailureHandler.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationFailureHandler.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationFailureHandler.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationService.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationService.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationService.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationService.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationToken.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationToken.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationToken.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationToken.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/DefaultAuthenticationFailureHandler.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/DefaultAuthenticationFailureHandler.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/DefaultAuthenticationFailureHandler.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/DefaultAuthenticationFailureHandler.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/Realm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/Realm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/Realm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/Realm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmConfig.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolver.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactory.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactory.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactory.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactory.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateTool.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateTool.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateTool.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateTool.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/UserAndPassword.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/UserAndPassword.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/UserAndPassword.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/UserAndPassword.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/tool/UsersTool.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/tool/UsersTool.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/file/tool/UsersTool.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/file/tool/UsersTool.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactory.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactory.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactory.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactory.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolver.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolver.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolver.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolver.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolver.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolver.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolver.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolver.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/AbstractLdapRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/AbstractLdapRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/AbstractLdapRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/AbstractLdapRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancing.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancing.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancing.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancing.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSearchScope.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSession.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSession.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSession.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapSession.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapUtils.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapUtils.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapUtils.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapUtils.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/PkiRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/PkiRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/PkiRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/PkiRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/X509AuthenticationToken.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/X509AuthenticationToken.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/X509AuthenticationToken.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/pki/X509AuthenticationToken.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/BCrypt.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/BCrypt.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/BCrypt.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/BCrypt.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CharArrays.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CharArrays.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CharArrays.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/CharArrays.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapper.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapper.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapper.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapper.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/Hasher.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/RefreshListener.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecuredString.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecuredString.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecuredString.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/SecuredString.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordRealm.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordToken.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationUtils.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/RoleDescriptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReader.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReader.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReader.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReader.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReader.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReader.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReader.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReader.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControl.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControl.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControl.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControl.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCache.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCache.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCache.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCache.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/RequestContext.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/RequestContext.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/RequestContext.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/RequestContext.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolver.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ClusterPermission.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ClusterPermission.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ClusterPermission.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ClusterPermission.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/DefaultRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/DefaultRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/DefaultRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/DefaultRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissions.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissions.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissions.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissions.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/GlobalPermission.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/GlobalPermission.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/GlobalPermission.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/GlobalPermission.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IndicesPermission.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IndicesPermission.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IndicesPermission.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IndicesPermission.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Permission.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Permission.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Permission.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Permission.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/Role.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RunAsPermission.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RunAsPermission.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RunAsPermission.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/RunAsPermission.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/TransportClientRole.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/TransportClientRole.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/TransportClientRole.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/permission/TransportClientRole.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/AbstractAutomatonPrivilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/GeneralPrivilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/HealthAndStatsPrivilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/IndexPrivilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/Privilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/privilege/SystemPrivilege.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/FileRolesStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/FileRolesStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/FileRolesStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/FileRolesStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RolesStore.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RolesStore.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RolesStore.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RolesStore.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/client/SecurityClient.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/client/SecurityClient.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/client/SecurityClient.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/client/SecurityClient.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/crypto/CryptoService.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/crypto/CryptoService.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/crypto/CryptoService.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/crypto/CryptoService.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyTool.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyTool.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyTool.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyTool.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/RemoteHostHeader.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestModule.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/AbstractSecurityModule.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/AutomatonPredicate.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/Automatons.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/Exceptions.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/FileAttributesChecker.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/FileAttributesChecker.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/FileAttributesChecker.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/FileAttributesChecker.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/MetadataUtils.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/MetadataUtils.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/MetadataUtils.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/MetadataUtils.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/NoOpLogger.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/NoOpLogger.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/NoOpLogger.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/NoOpLogger.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityFiles.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityFiles.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityFiles.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityFiles.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/Validation.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/Validation.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/support/Validation.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/support/Validation.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/SSLExceptionHelper.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/SSLExceptionHelper.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/SSLExceptionHelper.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/SSLExceptionHelper.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/IPFilter.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/IPFilter.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/IPFilter.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/IPFilter.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRule.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRule.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRule.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRule.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandler.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandler.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandler.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandler.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandler.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransport.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransport.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransport.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransport.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3Transport.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3Transport.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3Transport.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3Transport.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilter.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilter.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilter.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilter.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4Transport.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4Transport.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4Transport.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4Transport.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/AnonymousUser.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/AnonymousUser.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/AnonymousUser.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/AnonymousUser.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/ElasticUser.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/ElasticUser.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/ElasticUser.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/ElasticUser.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/KibanaUser.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/KibanaUser.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/KibanaUser.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/KibanaUser.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/SystemUser.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/SystemUser.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/SystemUser.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/SystemUser.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/User.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/User.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/User.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/User.java diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/XPackUser.java b/elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/XPackUser.java similarity index 100% rename from elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/user/XPackUser.java rename to elasticsearch/security/src/main/java/org/elasticsearch/xpack/security/user/XPackUser.java diff --git a/elasticsearch/x-pack/security/src/main/resources/org/elasticsearch/xpack/security/crypto/migrate.help b/elasticsearch/security/src/main/resources/org/elasticsearch/xpack/security/crypto/migrate.help similarity index 100% rename from elasticsearch/x-pack/security/src/main/resources/org/elasticsearch/xpack/security/crypto/migrate.help rename to elasticsearch/security/src/main/resources/org/elasticsearch/xpack/security/crypto/migrate.help diff --git a/elasticsearch/x-pack/security/src/main/resources/org/elasticsearch/xpack/security/crypto/tool/syskey-generate.help b/elasticsearch/security/src/main/resources/org/elasticsearch/xpack/security/crypto/tool/syskey-generate.help similarity index 100% rename from elasticsearch/x-pack/security/src/main/resources/org/elasticsearch/xpack/security/crypto/tool/syskey-generate.help rename to elasticsearch/security/src/main/resources/org/elasticsearch/xpack/security/crypto/tool/syskey-generate.help diff --git a/elasticsearch/x-pack/security/src/main/resources/security-index-template.json b/elasticsearch/security/src/main/resources/security-index-template.json similarity index 100% rename from elasticsearch/x-pack/security/src/main/resources/security-index-template.json rename to elasticsearch/security/src/main/resources/security-index-template.json diff --git a/elasticsearch/x-pack/security/src/main/resources/security_audit_log.json b/elasticsearch/security/src/main/resources/security_audit_log.json similarity index 100% rename from elasticsearch/x-pack/security/src/main/resources/security_audit_log.json rename to elasticsearch/security/src/main/resources/security_audit_log.json diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java b/elasticsearch/security/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java rename to elasticsearch/security/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/bench/HasherBenchmark.java b/elasticsearch/security/src/test/java/org/elasticsearch/bench/HasherBenchmark.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/bench/HasherBenchmark.java rename to elasticsearch/security/src/test/java/org/elasticsearch/bench/HasherBenchmark.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/http/netty3/Netty3HttpMockUtil.java b/elasticsearch/security/src/test/java/org/elasticsearch/http/netty3/Netty3HttpMockUtil.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/http/netty3/Netty3HttpMockUtil.java rename to elasticsearch/security/src/test/java/org/elasticsearch/http/netty3/Netty3HttpMockUtil.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/http/netty4/Netty4HttpMockUtil.java b/elasticsearch/security/src/test/java/org/elasticsearch/http/netty4/Netty4HttpMockUtil.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/http/netty4/Netty4HttpMockUtil.java rename to elasticsearch/security/src/test/java/org/elasticsearch/http/netty4/Netty4HttpMockUtil.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/AbstractPrivilegeTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/AbstractPrivilegeTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/AbstractPrivilegeTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/AbstractPrivilegeTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/BulkUpdateTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/BulkUpdateTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/BulkUpdateTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/BulkUpdateTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ClearRealmsCacheTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ClearRealmsCacheTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ClearRealmsCacheTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ClearRealmsCacheTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ClearRolesCacheTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ClearRolesCacheTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ClearRolesCacheTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ClearRolesCacheTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DateMathExpressionIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/DateMathExpressionIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DateMathExpressionIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/DateMathExpressionIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/PermissionPrecedenceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/PermissionPrecedenceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/PermissionPrecedenceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/PermissionPrecedenceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ScrollIdSigningTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ScrollIdSigningTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ScrollIdSigningTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ScrollIdSigningTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/SecurityCachePermissionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/SecurityCachePermissionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/SecurityCachePermissionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/SecurityCachePermissionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/SecurityClearScrollTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/SecurityClearScrollTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/SecurityClearScrollTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/SecurityClearScrollTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ldap/AbstractAdLdapRealmTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ldap/AbstractAdLdapRealmTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ldap/AbstractAdLdapRealmTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ldap/AbstractAdLdapRealmTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ldap/GroupMappingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ldap/GroupMappingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ldap/GroupMappingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ldap/GroupMappingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ldap/MultiGroupMappingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/integration/ldap/MultiGroupMappingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/integration/ldap/MultiGroupMappingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/integration/ldap/MultiGroupMappingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/license/LicensingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/license/LicensingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/license/LicensingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/license/LicensingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/license/XPackLicenseStateTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/license/XPackLicenseStateTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/license/XPackLicenseStateTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/license/XPackLicenseStateTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/NativeRealmIntegTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/test/NativeRealmIntegTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/NativeRealmIntegTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/test/NativeRealmIntegTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java b/elasticsearch/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java rename to elasticsearch/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java b/elasticsearch/security/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java rename to elasticsearch/security/src/test/java/org/elasticsearch/test/SecurityTestsUtils.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/KnownActionsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/transport/KnownActionsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/KnownActionsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/transport/KnownActionsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/SecurityServerTransportServiceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/transport/SecurityServerTransportServiceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/SecurityServerTransportServiceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/transport/SecurityServerTransportServiceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/netty3/Netty3MockUtil.java b/elasticsearch/security/src/test/java/org/elasticsearch/transport/netty3/Netty3MockUtil.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/netty3/Netty3MockUtil.java rename to elasticsearch/security/src/test/java/org/elasticsearch/transport/netty3/Netty3MockUtil.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/netty4/Netty4MockUtil.java b/elasticsearch/security/src/test/java/org/elasticsearch/transport/netty4/Netty4MockUtil.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/transport/netty4/Netty4MockUtil.java rename to elasticsearch/security/src/test/java/org/elasticsearch/transport/netty4/Netty4MockUtil.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityF.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityF.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityF.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityF.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityFeatureSetTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityPluginTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityPluginTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityPluginTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityPluginTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecuritySettingsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecuritySettingsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecuritySettingsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecuritySettingsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/PutRoleBuilderTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/PutRoleBuilderTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/PutRoleBuilderTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/PutRoleBuilderTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/role/TransportPutRoleActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportAuthenticateActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportChangePasswordActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportDeleteUserActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportGetUsersActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportPutUserActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditLevelTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditLevelTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditLevelTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditLevelTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditTrailServiceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditUtilTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditUtilTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditUtilTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/AuditUtilTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailUpdateMappingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailUpdateMappingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailUpdateMappingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailUpdateMappingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/RemoteIndexAuditTrailStartingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/RemoteIndexAuditTrailStartingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/index/RemoteIndexAuditTrailStartingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/index/RemoteIndexAuditTrailStartingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/CapturingLogger.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/CapturingLogger.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/CapturingLogger.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/CapturingLogger.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrailTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrailTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrailTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrailTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/RunAsIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/AbstractActiveDirectoryIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/AbstractActiveDirectoryIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/AbstractActiveDirectoryIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/AbstractActiveDirectoryIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolverTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolverTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryGroupsResolverTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealmTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealmTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealmTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectoryRealmTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactoryTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactoryTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/activedirectory/ActiveDirectorySessionFactoryTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateToolTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateToolTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateToolTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeRealmMigrateToolTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStoreTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStoreTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStoreTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStoreTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStoreTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStoreTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStoreTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStoreTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/GroupsResolverTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/GroupsResolverTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/GroupsResolverTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/GroupsResolverTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactoryTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactoryTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapUserSearchSessionFactoryTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolverTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolverTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolverTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolverTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolverTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolverTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/UserAttributeGroupsResolverTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LDAPServersTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LDAPServersTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LDAPServersTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LDAPServersTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapLoadBalancingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapTestCase.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapTestCase.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapTestCase.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapTestCase.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryLoadBalancingTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryLoadBalancingTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryLoadBalancingTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryLoadBalancingTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthenticationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthenticationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthenticationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthenticationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiOptionalClientAuthTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiOptionalClientAuthTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiOptionalClientAuthTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiOptionalClientAuthTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiRealmTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiRealmTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiRealmTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/pki/PkiRealmTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/BCryptTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/BCryptTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/BCryptTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/BCryptTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealmTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealmTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealmTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/CachingUsernamePasswordRealmTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/HasherTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/SecuredStringTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/SecuredStringTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/SecuredStringTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/SecuredStringTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authc/support/UsernamePasswordTokenTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/AnalyzeTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/AnalyzeTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/AnalyzeTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/AnalyzeTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationUtilsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationUtilsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationUtilsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/IndexAliasesTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/IndexAliasesTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/IndexAliasesTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/IndexAliasesTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/RoleDescriptorTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/RoleDescriptorTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/RoleDescriptorTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/RoleDescriptorTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReaderTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReaderTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReaderTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/DocumentSubsetReaderTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldDataCacheWithFieldSubsetReaderTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldDataCacheWithFieldSubsetReaderTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldDataCacheWithFieldSubsetReaderTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldDataCacheWithFieldSubsetReaderTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReaderTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReaderTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReaderTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReaderTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControlTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControlTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControlTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesAccessControlTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesPermissionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesPermissionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesPermissionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/IndicesPermissionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperIntegrationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperIntegrationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperIntegrationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperUnitTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperUnitTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperUnitTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapperUnitTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorFactoryTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorFactoryTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorFactoryTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/SetSecurityUserProcessorTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesResolverTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesResolverTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesResolverTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/DefaultIndicesResolverTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolverIntegrationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolverIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolverIntegrationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/indicesresolver/IndicesAndAliasesResolverIntegrationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/DefaultRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/DefaultRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/DefaultRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/DefaultRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/FieldPermissionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/IngestAdminRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/KibanaUserRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/MonitoringUserRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/PermissionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/RemoteMonitoringAgentRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/ReportingUserRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRoleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRoleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRoleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/permission/SuperuserRoleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/privilege/PrivilegeTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/store/FileRolesStoreTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/store/FileRolesStoreTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/store/FileRolesStoreTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/store/FileRolesStoreTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStoreTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStoreTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStoreTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/authz/store/ReservedRolesStoreTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/crypto/CryptoServiceTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/crypto/CryptoServiceTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/crypto/CryptoServiceTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/crypto/CryptoServiceTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyToolTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyToolTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyToolTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/crypto/tool/SystemKeyToolTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateActionTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateActionTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateActionTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateActionTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/AutomatonsTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/FileAttributesCheckerTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/FileAttributesCheckerTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/FileAttributesCheckerTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/FileAttributesCheckerTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityFilesTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityFilesTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityFilesTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityFilesTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/support/ValidationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityAssertions.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityAssertions.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityAssertions.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityAssertions.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityTestUtils.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityTestUtils.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityTestUtils.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/test/SecurityTestUtils.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/TransportFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IPFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringIntegrationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringIntegrationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringIntegrationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRuleTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRuleTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRuleTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/SecurityIpFilterRuleTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandlerTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandlerTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandlerTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPFilterNetty3UpstreamHandlerTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPHostnameVerificationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPHostnameVerificationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPHostnameVerificationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/IPHostnameVerificationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandlerTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandlerTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandlerTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/Netty3HandshakeWaitingHandlerTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransportTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransportTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransportTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3HttpServerTransportTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3TransportTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3TransportTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3TransportTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SecurityNetty3TransportTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SslHostnameVerificationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SslHostnameVerificationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SslHostnameVerificationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty3/SslHostnameVerificationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilterTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilterTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilterTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/IpFilterRemoteAddressFilterTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4TransportTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4TransportTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4TransportTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4TransportTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslIntegrationTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslIntegrationTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslIntegrationTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslMultiPortTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslMultiPortTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslMultiPortTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/transport/ssl/SslMultiPortTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserIntegTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserIntegTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserIntegTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserIntegTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/AnonymousUserTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/SystemUserTests.java diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/UserTests.java b/elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/UserTests.java similarity index 100% rename from elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/user/UserTests.java rename to elasticsearch/security/src/test/java/org/elasticsearch/xpack/security/user/UserTests.java diff --git a/elasticsearch/x-pack/security/src/test/resources/log4j.properties b/elasticsearch/security/src/test/resources/log4j.properties similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/log4j.properties rename to elasticsearch/security/src/test/resources/log4j.properties diff --git a/elasticsearch/x-pack/security/src/test/resources/missing-version-security-index-template.json b/elasticsearch/security/src/test/resources/missing-version-security-index-template.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/missing-version-security-index-template.json rename to elasticsearch/security/src/test/resources/missing-version-security-index-template.json diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/transport/actions b/elasticsearch/security/src/test/resources/org/elasticsearch/transport/actions similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/transport/actions rename to elasticsearch/security/src/test/resources/org/elasticsearch/transport/actions diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/transport/handlers b/elasticsearch/security/src/test/resources/org/elasticsearch/transport/handlers similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/transport/handlers rename to elasticsearch/security/src/test/resources/org/elasticsearch/transport/handlers diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/action/role/roles2xformat.json b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/action/role/roles2xformat.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/action/role/roles2xformat.json rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/action/role/roles2xformat.json diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad-schema.ldif b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad-schema.ldif similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad-schema.ldif rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad-schema.ldif diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad.ldif b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad.ldif similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad.ldif rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/ad.ldif diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/role_mapping.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/role_mapping.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/role_mapping.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/activedirectory/role_mapping.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users_roles b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users_roles similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users_roles rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/file/users_roles diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithGroupSearch.yaml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithGroupSearch.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithGroupSearch.yaml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithGroupSearch.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithRoleMapping.yaml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithRoleMapping.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithRoleMapping.yaml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldapWithRoleMapping.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldaptrust.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldaptrust.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldaptrust.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/ldaptrust.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/seven-seas.ldif b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/seven-seas.ldif similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/seven-seas.ldif rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/ldap/support/seven-seas.ldif diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/pki/role_mapping.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/pki/role_mapping.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/pki/role_mapping.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/pki/role_mapping.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/support/role_mapping.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/support/role_mapping.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authc/support/role_mapping.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authc/support/role_mapping.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/default_roles.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/default_roles.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/default_roles.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/default_roles.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/reserved_roles.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/reserved_roles.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/reserved_roles.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/reserved_roles.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.json b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.json rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.json diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/roles2xformat.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/plugin/roles.yml b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/plugin/roles.yml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/plugin/roles.yml rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/plugin/roles.yml diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users_roles b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users_roles similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users_roles rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/plugin/users_roles diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/README.asciidoc b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/README.asciidoc similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/README.asciidoc rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/README.asciidoc diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/active-directory-ca.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/active-directory-ca.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/active-directory-ca.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/active-directory-ca.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.der b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.der similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.der rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openldap.der diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openssl_config.cnf b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openssl_config.cnf similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openssl_config.cnf rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/openssl_config.cnf diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.p12 b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.p12 similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.p12 rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.p12 diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.pem b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.pem similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.pem rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient-client-profile.pem diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.p12 b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.p12 similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.p12 rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.p12 diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.pem b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.pem similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.pem rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testclient.pem diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.p12 b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.p12 similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.p12 rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.p12 diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.pem b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.pem similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.pem rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-client-profile.pem diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-different-passwords.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-different-passwords.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-different-passwords.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-different-passwords.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-ip-only.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.cert b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.cert similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.cert rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.cert diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode-no-subjaltname.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.p12 b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.p12 similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.p12 rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.p12 diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem diff --git a/elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/truststore-testnode-only.jks b/elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/truststore-testnode-only.jks similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/truststore-testnode-only.jks rename to elasticsearch/security/src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/truststore-testnode-only.jks diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.authenticate.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.authenticate.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.authenticate.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.authenticate.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.change_password.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.change_password.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.change_password.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.change_password.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_realms.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_realms.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_realms.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_realms.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_roles.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_roles.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_roles.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.clear_cached_roles.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.delete_role.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.delete_role.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.delete_role.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.delete_role.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.delete_user.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.delete_user.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.delete_user.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.delete_user.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.disable_user.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.disable_user.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.disable_user.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.disable_user.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.enable_user.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.enable_user.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.enable_user.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.enable_user.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.get_role.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.get_role.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.get_role.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.get_role.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.get_user.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.get_user.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.get_user.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.get_user.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.put_role.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.put_role.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.put_role.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.put_role.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.put_user.json b/elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.put_user.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/api/xpack.security.put_user.json rename to elasticsearch/security/src/test/resources/rest-api-spec/api/xpack.security.put_user.json diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/authenticate/10_basic.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/authenticate/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/authenticate/10_basic.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/authenticate/10_basic.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/change_password/10_basic.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/change_password/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/change_password/10_basic.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/change_password/10_basic.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/10_basic.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/roles/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/10_basic.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/roles/10_basic.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/20_get_missing.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/roles/20_get_missing.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/20_get_missing.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/roles/20_get_missing.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/30_prohibited_role_query.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/roles/30_prohibited_role_query.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/30_prohibited_role_query.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/roles/30_prohibited_role_query.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/10_basic.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/users/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/10_basic.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/users/10_basic.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/15_overwrite_user.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/users/15_overwrite_user.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/15_overwrite_user.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/users/15_overwrite_user.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/16_update_user.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/users/16_update_user.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/16_update_user.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/users/16_update_user.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/20_get_missing.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/users/20_get_missing.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/20_get_missing.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/users/20_get_missing.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/30_enable_disable.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/users/30_enable_disable.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/30_enable_disable.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/users/30_enable_disable.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/31_create_disabled.yaml b/elasticsearch/security/src/test/resources/rest-api-spec/test/users/31_create_disabled.yaml similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/users/31_create_disabled.yaml rename to elasticsearch/security/src/test/resources/rest-api-spec/test/users/31_create_disabled.yaml diff --git a/elasticsearch/x-pack/security/src/test/resources/wrong-version-security-index-template.json b/elasticsearch/security/src/test/resources/wrong-version-security-index-template.json similarity index 100% rename from elasticsearch/x-pack/security/src/test/resources/wrong-version-security-index-template.json rename to elasticsearch/security/src/test/resources/wrong-version-security-index-template.json diff --git a/elasticsearch/x-pack/security/test-signatures.txt b/elasticsearch/security/test-signatures.txt similarity index 100% rename from elasticsearch/x-pack/security/test-signatures.txt rename to elasticsearch/security/test-signatures.txt diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/common/network/InetAddressHelper.java b/elasticsearch/src/main/java/org/elasticsearch/common/network/InetAddressHelper.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/common/network/InetAddressHelper.java rename to elasticsearch/src/main/java/org/elasticsearch/common/network/InetAddressHelper.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackInfoResponse.java b/elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackInfoResponse.java rename to elasticsearch/src/main/java/org/elasticsearch/license/XPackInfoResponse.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackLicenseState.java b/elasticsearch/src/main/java/org/elasticsearch/license/XPackLicenseState.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/license/XPackLicenseState.java rename to elasticsearch/src/main/java/org/elasticsearch/license/XPackLicenseState.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackBuild.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackBuild.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackBuild.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/XPackBuild.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackClient.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackClient.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackClient.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/XPackClient.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/XPackFeatureSet.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackPlugin.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/XPackPlugin.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackSettings.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackSettings.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackSettings.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/XPackSettings.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackInfoAction.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/TransportXPackUsageAction.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoAction.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequestBuilder.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageAction.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequest.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequestBuilder.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageRequestBuilder.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackUsageResponse.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpClient.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpClient.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpClient.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpClient.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpContentType.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpMethod.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpProxy.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpProxy.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpProxy.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpProxy.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequest.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpRequestTemplate.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/HttpResponse.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/Scheme.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/Scheme.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/Scheme.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/Scheme.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/ApplicableHttpAuth.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuth.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthFactory.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/HttpAuthRegistry.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/ApplicableBasicAuth.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuth.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/http/auth/basic/BasicAuthFactory.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/init/proxy/ClientProxy.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/init/proxy/ClientProxy.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/init/proxy/ClientProxy.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/init/proxy/ClientProxy.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/secret/Secret.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/stats/Counters.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/stats/Counters.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/stats/Counters.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/stats/Counters.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/text/TextTemplate.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/text/TextTemplate.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/text/TextTemplate.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/text/TextTemplate.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/text/TextTemplateEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/text/TextTemplateEngine.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/text/TextTemplateEngine.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/text/TextTemplateEngine.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/common/xcontent/XContentUtils.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommand.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommand.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommand.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommand.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommand.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommand.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommand.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommand.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommand.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommand.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommand.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommand.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtension.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtension.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtension.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtension.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionCli.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionCli.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionCli.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionCli.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionInfo.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionInfo.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionInfo.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionInfo.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionPolicy.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionPolicy.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionPolicy.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionPolicy.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurity.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurity.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurity.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurity.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionsService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionsService.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionsService.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionsService.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Account.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Account.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Email.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Email.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Email.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailService.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailService.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailService.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/HtmlSanitizer.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Profile.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Profile.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Profile.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Profile.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachment.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachment.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachment.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachments.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachments.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachments.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachments.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentsParser.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentsParser.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentsParser.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentsParser.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/support/BodyPartSource.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatService.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatService.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatService.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaults.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaults.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaults.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaults.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyService.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyService.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyService.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackService.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackService.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/SlackService.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/MessageElement.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/rest/XPackRestHandler.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/rest/XPackRestHandler.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/rest/XPackRestHandler.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/rest/XPackRestHandler.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/CertUtils.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/CertUtils.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/CertUtils.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/CertUtils.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/CertificateTool.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/CertificateTool.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/CertificateTool.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/CertificateTool.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/DefaultJDKTrustConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/DefaultJDKTrustConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/DefaultJDKTrustConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/DefaultJDKTrustConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/KeyConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/KeyConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/KeyConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/KeyConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/PEMKeyConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/PEMKeyConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/PEMKeyConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/PEMKeyConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/PEMTrustConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/PEMTrustConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/PEMTrustConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/PEMTrustConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLClientAuth.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLClientAuth.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLClientAuth.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLClientAuth.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLConfiguration.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLConfiguration.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLConfiguration.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLConfiguration.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloader.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloader.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloader.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloader.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLService.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/SSLService.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/SSLService.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/StoreKeyConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/StoreKeyConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/StoreKeyConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/StoreKeyConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/StoreTrustConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/StoreTrustConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/StoreTrustConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/StoreTrustConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/TrustAllConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/TrustAllConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/TrustAllConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/TrustAllConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/TrustConfig.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/TrustConfig.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/TrustConfig.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/TrustConfig.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/VerificationMode.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/VerificationMode.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/ssl/VerificationMode.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/ssl/VerificationMode.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/Clock.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/HaltedClock.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/support/clock/SystemClock.java diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/template/TemplateUtils.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/template/TemplateUtils.java similarity index 100% rename from elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/template/TemplateUtils.java rename to elasticsearch/src/main/java/org/elasticsearch/xpack/template/TemplateUtils.java diff --git a/elasticsearch/x-pack/src/main/plugin-metadata/plugin-security.policy b/elasticsearch/src/main/plugin-metadata/plugin-security.policy similarity index 100% rename from elasticsearch/x-pack/src/main/plugin-metadata/plugin-security.policy rename to elasticsearch/src/main/plugin-metadata/plugin-security.policy diff --git a/elasticsearch/x-pack/src/main/resources/xpack-build.properties b/elasticsearch/src/main/resources/xpack-build.properties similarity index 100% rename from elasticsearch/x-pack/src/main/resources/xpack-build.properties rename to elasticsearch/src/main/resources/xpack-build.properties diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TestXPackTransportClient.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/TestXPackTransportClient.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TestXPackTransportClient.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/TestXPackTransportClient.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/action/TransportXPackInfoActionTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/action/TransportXPackInfoActionTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/action/TransportXPackInfoActionTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/action/TransportXPackInfoActionTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpConnectionTimeoutTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpReadTimeoutTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTemplateTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTemplateTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTemplateTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTemplateTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpRequestTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpResponseTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/stats/CountersTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/stats/CountersTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/stats/CountersTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/stats/CountersTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/text/TextTemplateTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/text/TextTemplateTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/common/text/TextTemplateTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/common/text/TextTemplateTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommandTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommandTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommandTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/InstallXPackExtensionCommandTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommandTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommandTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommandTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/ListXPackExtensionCommandTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommandTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommandTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommandTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/RemoveXPackExtensionCommandTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurityTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurityTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurityTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionSecurityTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionTestUtil.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionTestUtil.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionTestUtil.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionTestUtil.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionsServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionsServiceTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionsServiceTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionsServiceTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/DataAttachmentTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/DataAttachmentTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/DataAttachmentTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/DataAttachmentTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailServiceTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailServiceTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailServiceTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/EmailTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/HtmlSanitizerTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ProfileTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/ProfileTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ProfileTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/ProfileTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParserTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParserTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParserTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParserTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/support/EmailServer.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/support/EmailServer.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/support/EmailServer.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/email/support/EmailServer.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatServiceTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaultsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/CertUtilsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/CertUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/CertUtilsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/CertUtilsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/CertificateToolTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/CertificateToolTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/CertificateToolTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/CertificateToolTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLClientAuthTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLClientAuthTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLClientAuthTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLClientAuthTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloaderTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloaderTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloaderTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationReloaderTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLConfigurationTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLReloadIntegTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLReloadIntegTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLReloadIntegTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLReloadIntegTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLServiceTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/ssl/SSLServiceTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/ssl/SSLServiceTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/support/clock/ClockTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/template/TemplateUtilsTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/template/TemplateUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/template/TemplateUtilsTests.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/template/TemplateUtilsTests.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestCase.java similarity index 100% rename from elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestCase.java rename to elasticsearch/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestTestCase.java diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.0.0.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.0.0.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.0.0.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.0.0.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.0.1.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.0.1.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.0.1.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.0.1.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.0.2.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.0.2.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.0.2.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.0.2.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.1.0.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.1.0.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.1.0.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.1.0.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.1.1.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.1.1.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.1.1.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.1.1.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.1.2.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.1.2.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.1.2.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.1.2.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.2.0.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.2.0.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.2.0.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.2.0.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.2.1.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.2.1.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.2.1.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.2.1.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.2.2.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.2.2.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.2.2.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.2.2.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.0.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.0.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.0.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.0.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.1.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.1.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.1.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.1.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.2.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.2.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.2.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.2.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.3.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.3.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.3.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.3.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.4.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.4.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.4.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.4.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.5.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.5.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.3.5.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.3.5.zip diff --git a/elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.4.0.zip b/elasticsearch/src/test/resources/indices/bwc/x-pack-2.4.0.zip similarity index 100% rename from elasticsearch/x-pack/src/test/resources/indices/bwc/x-pack-2.4.0.zip rename to elasticsearch/src/test/resources/indices/bwc/x-pack-2.4.0.zip diff --git a/elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/extensions/security/complex-x-pack-extension-security.policy b/elasticsearch/src/test/resources/org/elasticsearch/xpack/extensions/security/complex-x-pack-extension-security.policy similarity index 100% rename from elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/extensions/security/complex-x-pack-extension-security.policy rename to elasticsearch/src/test/resources/org/elasticsearch/xpack/extensions/security/complex-x-pack-extension-security.policy diff --git a/elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/extensions/security/simple-x-pack-extension-security.policy b/elasticsearch/src/test/resources/org/elasticsearch/xpack/extensions/security/simple-x-pack-extension-security.policy similarity index 100% rename from elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/extensions/security/simple-x-pack-extension-security.policy rename to elasticsearch/src/test/resources/org/elasticsearch/xpack/extensions/security/simple-x-pack-extension-security.policy diff --git a/elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/extensions/security/unresolved-x-pack-extension-security.policy b/elasticsearch/src/test/resources/org/elasticsearch/xpack/extensions/security/unresolved-x-pack-extension-security.policy similarity index 100% rename from elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/extensions/security/unresolved-x-pack-extension-security.policy rename to elasticsearch/src/test/resources/org/elasticsearch/xpack/extensions/security/unresolved-x-pack-extension-security.policy diff --git a/elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/ssl/instances.yml b/elasticsearch/src/test/resources/org/elasticsearch/xpack/ssl/instances.yml similarity index 100% rename from elasticsearch/x-pack/src/test/resources/org/elasticsearch/xpack/ssl/instances.yml rename to elasticsearch/src/test/resources/org/elasticsearch/xpack/ssl/instances.yml diff --git a/elasticsearch/x-pack/src/test/resources/rest-api-spec/api/xpack.info.json b/elasticsearch/src/test/resources/rest-api-spec/api/xpack.info.json similarity index 100% rename from elasticsearch/x-pack/src/test/resources/rest-api-spec/api/xpack.info.json rename to elasticsearch/src/test/resources/rest-api-spec/api/xpack.info.json diff --git a/elasticsearch/x-pack/src/test/resources/rest-api-spec/api/xpack.usage.json b/elasticsearch/src/test/resources/rest-api-spec/api/xpack.usage.json similarity index 100% rename from elasticsearch/x-pack/src/test/resources/rest-api-spec/api/xpack.usage.json rename to elasticsearch/src/test/resources/rest-api-spec/api/xpack.usage.json diff --git a/elasticsearch/x-pack/src/test/resources/rest-api-spec/test/xpack/10_basic.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/xpack/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/src/test/resources/rest-api-spec/test/xpack/10_basic.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/xpack/10_basic.yaml diff --git a/elasticsearch/x-pack/src/test/resources/rest-api-spec/test/xpack/15_basic.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/xpack/15_basic.yaml similarity index 100% rename from elasticsearch/x-pack/src/test/resources/rest-api-spec/test/xpack/15_basic.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/xpack/15_basic.yaml diff --git a/elasticsearch/x-pack/watcher/README.asciidoc b/elasticsearch/watcher/README.asciidoc similarity index 100% rename from elasticsearch/x-pack/watcher/README.asciidoc rename to elasticsearch/watcher/README.asciidoc diff --git a/elasticsearch/x-pack/watcher/bin/x-pack/croneval b/elasticsearch/watcher/bin/x-pack/croneval similarity index 100% rename from elasticsearch/x-pack/watcher/bin/x-pack/croneval rename to elasticsearch/watcher/bin/x-pack/croneval diff --git a/elasticsearch/x-pack/watcher/bin/x-pack/croneval.bat b/elasticsearch/watcher/bin/x-pack/croneval.bat similarity index 100% rename from elasticsearch/x-pack/watcher/bin/x-pack/croneval.bat rename to elasticsearch/watcher/bin/x-pack/croneval.bat diff --git a/elasticsearch/x-pack/watcher/dev-tools/randomization.yml b/elasticsearch/watcher/dev-tools/randomization.yml similarity index 100% rename from elasticsearch/x-pack/watcher/dev-tools/randomization.yml rename to elasticsearch/watcher/dev-tools/randomization.yml diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java b/elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java rename to elasticsearch/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java diff --git a/elasticsearch/x-pack/watcher/src/main/resources/triggered_watches.json b/elasticsearch/watcher/src/main/resources/triggered_watches.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/resources/triggered_watches.json rename to elasticsearch/watcher/src/main/resources/triggered_watches.json diff --git a/elasticsearch/x-pack/watcher/src/main/resources/watch_history.json b/elasticsearch/watcher/src/main/resources/watch_history.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/resources/watch_history.json rename to elasticsearch/watcher/src/main/resources/watch_history.json diff --git a/elasticsearch/x-pack/watcher/src/main/resources/watches.json b/elasticsearch/watcher/src/main/resources/watches.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/main/resources/watches.json rename to elasticsearch/watcher/src/main/resources/watches.json diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherFeatureSetTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherMetaDataSerializationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherMetaDataSerializationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherMetaDataSerializationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherMetaDataSerializationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryActionConditionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryActionConditionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryActionConditionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryActionConditionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInputTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInputTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInputTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInputTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/security/BasicSecurityTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/security/BasicSecurityTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/security/BasicSecurityTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/security/BasicSecurityTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequestTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequestTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequestTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateRequestTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HipChatServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HipChatServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HipChatServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HipChatServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/NoMasterNodeTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/NoMasterNodeTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/NoMasterNodeTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/NoMasterNodeTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/PagerDutyServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/PagerDutyServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/PagerDutyServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/PagerDutyServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchInputTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchInputTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchInputTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchInputTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SlackServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SlackServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SlackServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SlackServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchSerializationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchSerializationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchSerializationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchSerializationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusIntegrationTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStatusTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java b/elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java rename to elasticsearch/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode-different-passwords.jks b/elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode-different-passwords.jks similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode-different-passwords.jks rename to elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode-different-passwords.jks diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.cert b/elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.cert similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.cert rename to elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.cert diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.jks b/elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.jks similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.jks rename to elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/testnode.jks diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/truststore-testnode-only.jks b/elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/truststore-testnode-only.jks similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/truststore-testnode-only.jks rename to elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/security/keystore/truststore-testnode-only.jks diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/watcher/actions/email/service/logo.png b/elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/watcher/actions/email/service/logo.png similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/watcher/actions/email/service/logo.png rename to elasticsearch/watcher/src/test/resources/org/elasticsearch/xpack/watcher/actions/email/service/logo.png diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.ack_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.ack_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.ack_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.ack_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.activate_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.activate_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.activate_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.activate_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.deactivate_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.deactivate_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.deactivate_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.deactivate_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.delete_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.delete_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.delete_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.delete_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.execute_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.execute_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.execute_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.execute_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.get_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.get_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.get_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.get_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.restart.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.restart.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.restart.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.restart.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.start.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.start.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.start.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.start.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stats.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stats.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stats.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stats.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stop.json b/elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stop.json similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stop.json rename to elasticsearch/watcher/src/test/resources/rest-api-spec/api/xpack.watcher.stop.json diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/hijack/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/hijack/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/hijack/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/hijack/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/60_put_watch_with_action_condition.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/60_put_watch_with_action_condition.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/60_put_watch_with_action_condition.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/60_put_watch_with_action_condition.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml b/elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml rename to elasticsearch/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml diff --git a/elasticsearch/x-pack/build.gradle b/elasticsearch/x-pack/build.gradle deleted file mode 100644 index 4359e78988a..00000000000 --- a/elasticsearch/x-pack/build.gradle +++ /dev/null @@ -1,271 +0,0 @@ -import java.nio.charset.StandardCharsets -import java.nio.file.Files -import java.nio.file.Path -import java.nio.file.StandardCopyOption -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.test.NodeInfo - -group 'org.elasticsearch.plugin' - -apply plugin: 'elasticsearch.esplugin' -esplugin { - name 'x-pack' - description 'Elasticsearch Expanded Pack Plugin' - classname 'org.elasticsearch.xpack.XPackPlugin' -} - -ext.versions = [ - okhttp: '2.7.5' -] - -// TODO: fix this! https://github.com/elastic/x-plugins/issues/1066 -ext.compactProfile = 'full' - -dependencyLicenses.enabled = false - -licenseHeaders { - approvedLicenses << 'BCrypt (BSD-like)' - additionalLicense 'BCRYP', 'BCrypt (BSD-like)', 'Copyright (c) 2006 Damien Miller ' -} - -dependencies { - // security deps - compile project(path: ':modules:transport-netty3', configuration: 'runtime') - compile project(path: ':modules:transport-netty4', configuration: 'runtime') - compile 'dk.brics.automaton:automaton:1.11-8' - compile 'com.unboundid:unboundid-ldapsdk:3.1.1' - compile 'org.bouncycastle:bcprov-jdk15on:1.55' - compile 'org.bouncycastle:bcpkix-jdk15on:1.55' - testCompile 'com.google.jimfs:jimfs:1.1' - - // watcher deps - compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239' - compile 'com.google.guava:guava:16.0.1' // needed by watcher for the html sanitizer and security tests for jimfs - compile 'com.sun.mail:javax.mail:1.5.3' - // HACK: java 9 removed javax.activation from the default modules, so instead of trying to add modules, which would have - // to be conditionalized for java 8/9, we pull in the classes directly - compile 'javax.activation:activation:1.1' - - testCompile 'org.subethamail:subethasmtp:3.1.7' - // needed for subethasmtp, has @GuardedBy annotation - testCompile 'com.google.code.findbugs:jsr305:3.0.1' - - // monitoring deps - compile "org.elasticsearch.client:rest:${version}" - compile "org.elasticsearch.client:sniffer:${version}" - - // common test deps - testCompile 'org.elasticsearch:securemock:1.2' - testCompile 'org.slf4j:slf4j-log4j12:1.6.2' - testCompile 'org.slf4j:slf4j-api:1.6.2' - - // mock web server - testCompile "com.squareup.okhttp:mockwebserver:${versions.okhttp}" - testCompile "com.squareup.okhttp:okhttp:${versions.okhttp}" - testCompile "com.squareup.okhttp:okhttp-ws:${versions.okhttp}" - testCompile 'com.squareup.okio:okio:1.6.0' -} - -// we keep the source directories in the original structure of split plugins, -// in order to facilitate backports to 2.x. TODO: remove after 5.0 release -for (String module : ['', 'license-plugin/', 'security/', 'watcher/', 'monitoring/', 'graph/']) { - sourceSets { - main { - java.srcDir("${module}src/main/java") - resources.srcDir("${module}src/main/resources") - } - test { - java.srcDir("${module}src/test/java") - resources.srcDir("${module}src/test/resources") - } - } -} - -// make LicenseSigner available for testing signed licenses -sourceSets.test.java { - srcDir '../license-tools/src/main/java' -} - -compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" -compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" - -ext.expansions = [ - 'project.version': version, -] - -processResources { - from(sourceSets.main.resources.srcDirs) { - exclude '**/public.key' - inputs.properties(expansions) - MavenFilteringHack.filter(it, expansions) - } - boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true")) - if (snapshot) { - from 'license-plugin/keys/dev/public.key' - } else { - from 'license-plugin/keys/prod/public.key' - } -} - -forbiddenPatterns { - exclude '**/*.key' - exclude '**/*.p12' - exclude '**/*.der' - exclude '**/*.zip' -} - -// TODO: standardize packaging config for plugins -bundlePlugin { - from(project(':x-plugins').projectDir) { - include 'LICENSE.txt' - } - from(projectDir) { - include 'NOTICE.txt' - } - from('bin/x-pack') { - into 'bin' - } - from('security/bin/x-pack') { - into 'bin' - } - from('security/config/x-pack') { - into 'config' - } - from('watcher/bin/x-pack') { - into 'bin' - } -} - -// add api jar for extension authors to compile against -// note this is just the normal x-pack jar for now, with a different name -project.afterEvaluate { - task apiJar { - dependsOn('generatePomFileForApijarPublication', project.jar) - doFirst { - Path jarFile = project.jar.outputs.files.singleFile.toPath() - String apiFileName = jarFile.fileName.toString().replace(project.version, "api-${project.version}") - Files.copy(jarFile, jarFile.resolveSibling(apiFileName), StandardCopyOption.REPLACE_EXISTING) - - String pomFileName = jarFile.fileName.toString().replace('.jar', '.pom') - String apiPomFileName = apiFileName.replace('.jar', '.pom') - Files.copy(jarFile.resolveSibling(pomFileName), jarFile.resolveSibling(apiPomFileName), - StandardCopyOption.REPLACE_EXISTING) - } - } - assemble.dependsOn(apiJar) - project.publishing { - publications { - apijar(MavenPublication) { - from project.components.java - artifactId = artifactId + '-api' - pom.withXml { XmlProvider xml -> - Node root = xml.asNode() - root.appendNode('name', project.pluginProperties.extension.name) - root.appendNode('description', project.pluginProperties.extension.description) - } - } - } - } -} - -integTest { - // TODO: fix this rest test to not depend on a hardcoded port! - systemProperty 'tests.rest.blacklist', 'getting_started/10_monitor_cluster_health/*,bulk/10_basic/*' - cluster { - setting 'xpack.monitoring.collection.interval', '3s' - waitCondition = { NodeInfo node, AntBuilder ant -> - File tmpFile = new File(node.cwd, 'wait.success') - for (int i = 0; i < 10; i++) { - // we use custom wait logic here as the elastic user is not available immediately and ant.get will fail when a 401 is returned - HttpURLConnection httpURLConnection = null; - try { - httpURLConnection = (HttpURLConnection) new URL("http://${node.httpUri()}/_cluster/health?wait_for_nodes=${numNodes}").openConnection(); - httpURLConnection.setRequestProperty("Authorization", "Basic " + - Base64.getEncoder().encodeToString("elastic:changeme".getBytes(StandardCharsets.UTF_8))); - httpURLConnection.setRequestMethod("GET"); - httpURLConnection.connect(); - if (httpURLConnection.getResponseCode() == 200) { - tmpFile.withWriter StandardCharsets.UTF_8.name(), { - it.write(httpURLConnection.getInputStream().getText(StandardCharsets.UTF_8.name())) - } - } - } catch (Exception e) { - if (i == 9) { - logger.error("final attempt of calling cluster health failed", e) - } else { - logger.debug("failed to call cluster health", e) - } - } finally { - if (httpURLConnection != null) { - httpURLConnection.disconnect(); - } - } - - // did not start, so wait a bit before trying again - Thread.sleep(500L); - } - return tmpFile.exists() - } - } -} - -// TODO: don't publish test artifacts just to run messy tests, fix the tests! -// https://github.com/elastic/x-plugins/issues/724 -configurations { - testArtifacts.extendsFrom testRuntime -} -task testJar(type: Jar) { - classifier "test" - from sourceSets.test.output -} -artifacts { - // normal es plugins do not publish the jar but we need to since users need it for Transport Clients and extensions - archives jar - testArtifacts testJar -} - -// classes are missing, e.g. com.ibm.icu.lang.UCharacter -thirdPartyAudit.excludes = [ - // uses internal java api: sun.misc.Unsafe - 'com.google.common.cache.Striped64', - 'com.google.common.cache.Striped64$1', - 'com.google.common.cache.Striped64$Cell', - 'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator', - 'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1', - - // pulled in as external dependency to work on java 9 - 'com.sun.activation.registries.LineTokenizer', - 'com.sun.activation.registries.LogSupport', - 'com.sun.activation.registries.MailcapFile', - 'com.sun.activation.registries.MailcapParseException', - 'com.sun.activation.registries.MailcapTokenizer', - 'com.sun.activation.registries.MimeTypeEntry', - 'com.sun.activation.registries.MimeTypeFile', - 'javax.activation.ActivationDataFlavor', - 'javax.activation.CommandInfo', - 'javax.activation.CommandMap', - 'javax.activation.CommandObject', - 'javax.activation.DataContentHandler', - 'javax.activation.DataContentHandlerFactory', - 'javax.activation.DataHandler$1', - 'javax.activation.DataHandler', - 'javax.activation.DataHandlerDataSource', - 'javax.activation.DataSource', - 'javax.activation.DataSourceDataContentHandler', - 'javax.activation.FileDataSource', - 'javax.activation.FileTypeMap', - 'javax.activation.MailcapCommandMap', - 'javax.activation.MimeType', - 'javax.activation.MimeTypeParameterList', - 'javax.activation.MimeTypeParseException', - 'javax.activation.MimetypesFileTypeMap', - 'javax.activation.ObjectDataContentHandler', - 'javax.activation.SecuritySupport$1', - 'javax.activation.SecuritySupport$2', - 'javax.activation.SecuritySupport$3', - 'javax.activation.SecuritySupport$4', - 'javax.activation.SecuritySupport$5', - 'javax.activation.SecuritySupport', - 'javax.activation.URLDataSource', - 'javax.activation.UnsupportedDataTypeException' -] diff --git a/elasticsearch/license-tools/bin/key-pair-generator b/license-tools/bin/key-pair-generator similarity index 100% rename from elasticsearch/license-tools/bin/key-pair-generator rename to license-tools/bin/key-pair-generator diff --git a/elasticsearch/license-tools/bin/license-generator b/license-tools/bin/license-generator similarity index 100% rename from elasticsearch/license-tools/bin/license-generator rename to license-tools/bin/license-generator diff --git a/elasticsearch/license-tools/bin/verify-license b/license-tools/bin/verify-license similarity index 100% rename from elasticsearch/license-tools/bin/verify-license rename to license-tools/bin/verify-license diff --git a/elasticsearch/license-tools/build.gradle b/license-tools/build.gradle similarity index 100% rename from elasticsearch/license-tools/build.gradle rename to license-tools/build.gradle diff --git a/elasticsearch/license-tools/dev-tools/integration-tests.xml b/license-tools/dev-tools/integration-tests.xml similarity index 100% rename from elasticsearch/license-tools/dev-tools/integration-tests.xml rename to license-tools/dev-tools/integration-tests.xml diff --git a/elasticsearch/license-tools/sample/license_spec.json b/license-tools/sample/license_spec.json similarity index 100% rename from elasticsearch/license-tools/sample/license_spec.json rename to license-tools/sample/license_spec.json diff --git a/elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java b/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java similarity index 100% rename from elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java rename to license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java diff --git a/elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java b/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java similarity index 100% rename from elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java rename to license-tools/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java diff --git a/elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java b/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java similarity index 100% rename from elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java rename to license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java diff --git a/elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java b/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java similarity index 100% rename from elasticsearch/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java rename to license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java diff --git a/elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/LicenseVerificationTests.java b/license-tools/src/test/java/org/elasticsearch/license/licensor/LicenseVerificationTests.java similarity index 100% rename from elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/LicenseVerificationTests.java rename to license-tools/src/test/java/org/elasticsearch/license/licensor/LicenseVerificationTests.java diff --git a/elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/TestUtils.java b/license-tools/src/test/java/org/elasticsearch/license/licensor/TestUtils.java similarity index 100% rename from elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/TestUtils.java rename to license-tools/src/test/java/org/elasticsearch/license/licensor/TestUtils.java diff --git a/elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java b/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java similarity index 100% rename from elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java rename to license-tools/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java diff --git a/elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java b/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java similarity index 100% rename from elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java rename to license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java diff --git a/elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java b/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java similarity index 100% rename from elasticsearch/license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java rename to license-tools/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java diff --git a/elasticsearch/license-tools/src/test/resources/log4j.properties b/license-tools/src/test/resources/log4j.properties similarity index 100% rename from elasticsearch/license-tools/src/test/resources/log4j.properties rename to license-tools/src/test/resources/log4j.properties diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/private.key b/license-tools/src/test/resources/private.key similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/private.key rename to license-tools/src/test/resources/private.key diff --git a/elasticsearch/x-pack/license-plugin/src/test/resources/public.key b/license-tools/src/test/resources/public.key similarity index 100% rename from elasticsearch/x-pack/license-plugin/src/test/resources/public.key rename to license-tools/src/test/resources/public.key diff --git a/elasticsearch/qa/audit-tests/build.gradle b/qa/audit-tests/build.gradle similarity index 100% rename from elasticsearch/qa/audit-tests/build.gradle rename to qa/audit-tests/build.gradle diff --git a/elasticsearch/qa/audit-tests/src/test/java/org/elasticsearch/xpack/security/audit/IndexAuditIT.java b/qa/audit-tests/src/test/java/org/elasticsearch/xpack/security/audit/IndexAuditIT.java similarity index 100% rename from elasticsearch/qa/audit-tests/src/test/java/org/elasticsearch/xpack/security/audit/IndexAuditIT.java rename to qa/audit-tests/src/test/java/org/elasticsearch/xpack/security/audit/IndexAuditIT.java diff --git a/elasticsearch/qa/build.gradle b/qa/build.gradle similarity index 100% rename from elasticsearch/qa/build.gradle rename to qa/build.gradle diff --git a/elasticsearch/qa/core-rest-tests-with-security/build.gradle b/qa/core-rest-tests-with-security/build.gradle similarity index 100% rename from elasticsearch/qa/core-rest-tests-with-security/build.gradle rename to qa/core-rest-tests-with-security/build.gradle diff --git a/elasticsearch/qa/core-rest-tests-with-security/src/test/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java b/qa/core-rest-tests-with-security/src/test/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/core-rest-tests-with-security/src/test/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java rename to qa/core-rest-tests-with-security/src/test/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/reindex-tests-with-security/build.gradle b/qa/reindex-tests-with-security/build.gradle similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/build.gradle rename to qa/reindex-tests-with-security/build.gradle diff --git a/elasticsearch/qa/reindex-tests-with-security/roles.yml b/qa/reindex-tests-with-security/roles.yml similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/roles.yml rename to qa/reindex-tests-with-security/roles.yml diff --git a/elasticsearch/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityClientYamlTestSuiteIT.java b/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityClientYamlTestSuiteIT.java rename to qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java b/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java rename to qa/reindex-tests-with-security/src/test/java/org/elasticsearch/xpack/security/ReindexWithSecurityIT.java diff --git a/elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/10_reindex.yaml b/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/10_reindex.yaml similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/10_reindex.yaml rename to qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/10_reindex.yaml diff --git a/elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/15_reindex_from_remote.yaml b/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/15_reindex_from_remote.yaml similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/15_reindex_from_remote.yaml rename to qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/15_reindex_from_remote.yaml diff --git a/elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/20_update_by_query.yaml b/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/20_update_by_query.yaml similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/20_update_by_query.yaml rename to qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/20_update_by_query.yaml diff --git a/elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/30_delete_by_query.yaml b/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/30_delete_by_query.yaml similarity index 100% rename from elasticsearch/qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/30_delete_by_query.yaml rename to qa/reindex-tests-with-security/src/test/resources/rest-api-spec/test/30_delete_by_query.yaml diff --git a/elasticsearch/qa/security-client-tests/build.gradle b/qa/security-client-tests/build.gradle similarity index 100% rename from elasticsearch/qa/security-client-tests/build.gradle rename to qa/security-client-tests/build.gradle diff --git a/elasticsearch/qa/security-client-tests/src/test/java/org/elasticsearch/xpack/security/qa/SecurityTransportClientIT.java b/qa/security-client-tests/src/test/java/org/elasticsearch/xpack/security/qa/SecurityTransportClientIT.java similarity index 100% rename from elasticsearch/qa/security-client-tests/src/test/java/org/elasticsearch/xpack/security/qa/SecurityTransportClientIT.java rename to qa/security-client-tests/src/test/java/org/elasticsearch/xpack/security/qa/SecurityTransportClientIT.java diff --git a/elasticsearch/qa/security-example-realm/build.gradle b/qa/security-example-realm/build.gradle similarity index 100% rename from elasticsearch/qa/security-example-realm/build.gradle rename to qa/security-example-realm/build.gradle diff --git a/elasticsearch/qa/security-example-realm/src/main/java/org/elasticsearch/example/ExampleRealmExtension.java b/qa/security-example-realm/src/main/java/org/elasticsearch/example/ExampleRealmExtension.java similarity index 100% rename from elasticsearch/qa/security-example-realm/src/main/java/org/elasticsearch/example/ExampleRealmExtension.java rename to qa/security-example-realm/src/main/java/org/elasticsearch/example/ExampleRealmExtension.java diff --git a/elasticsearch/qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomAuthenticationFailureHandler.java b/qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomAuthenticationFailureHandler.java similarity index 100% rename from elasticsearch/qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomAuthenticationFailureHandler.java rename to qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomAuthenticationFailureHandler.java diff --git a/elasticsearch/qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomRealm.java b/qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomRealm.java similarity index 100% rename from elasticsearch/qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomRealm.java rename to qa/security-example-realm/src/main/java/org/elasticsearch/example/realm/CustomRealm.java diff --git a/elasticsearch/qa/security-example-realm/src/main/resources/x-pack-extension-descriptor.properties b/qa/security-example-realm/src/main/resources/x-pack-extension-descriptor.properties similarity index 100% rename from elasticsearch/qa/security-example-realm/src/main/resources/x-pack-extension-descriptor.properties rename to qa/security-example-realm/src/main/resources/x-pack-extension-descriptor.properties diff --git a/elasticsearch/qa/security-example-realm/src/main/resources/x-pack-extension-security.policy b/qa/security-example-realm/src/main/resources/x-pack-extension-security.policy similarity index 100% rename from elasticsearch/qa/security-example-realm/src/main/resources/x-pack-extension-security.policy rename to qa/security-example-realm/src/main/resources/x-pack-extension-security.policy diff --git a/elasticsearch/qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java b/qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java similarity index 100% rename from elasticsearch/qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java rename to qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java diff --git a/elasticsearch/qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmTests.java b/qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmTests.java similarity index 100% rename from elasticsearch/qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmTests.java rename to qa/security-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmTests.java diff --git a/elasticsearch/qa/security-migrate-tests/build.gradle b/qa/security-migrate-tests/build.gradle similarity index 100% rename from elasticsearch/qa/security-migrate-tests/build.gradle rename to qa/security-migrate-tests/build.gradle diff --git a/elasticsearch/qa/security-migrate-tests/roles.yml b/qa/security-migrate-tests/roles.yml similarity index 100% rename from elasticsearch/qa/security-migrate-tests/roles.yml rename to qa/security-migrate-tests/roles.yml diff --git a/elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java b/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java similarity index 100% rename from elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java rename to qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolIT.java diff --git a/elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java b/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java similarity index 100% rename from elasticsearch/qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java rename to qa/security-migrate-tests/src/test/java/org/elasticsearch/xpack/security/MigrateToolTestCase.java diff --git a/elasticsearch/qa/smoke-test-graph-with-security/build.gradle b/qa/smoke-test-graph-with-security/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-graph-with-security/build.gradle rename to qa/smoke-test-graph-with-security/build.gradle diff --git a/elasticsearch/qa/smoke-test-graph-with-security/roles.yml b/qa/smoke-test-graph-with-security/roles.yml similarity index 100% rename from elasticsearch/qa/smoke-test-graph-with-security/roles.yml rename to qa/smoke-test-graph-with-security/roles.yml diff --git a/elasticsearch/qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityIT.java b/qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityIT.java rename to qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityIT.java diff --git a/elasticsearch/qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityInsufficientRoleIT.java b/qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityInsufficientRoleIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityInsufficientRoleIT.java rename to qa/smoke-test-graph-with-security/src/test/java/org/elasticsearch/smoketest/GraphWithSecurityInsufficientRoleIT.java diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle b/qa/smoke-test-monitoring-with-security/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle rename to qa/smoke-test-monitoring-with-security/build.gradle diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/insufficient-rights/build.gradle b/qa/smoke-test-monitoring-with-security/insufficient-rights/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-monitoring-with-security/insufficient-rights/build.gradle rename to qa/smoke-test-monitoring-with-security/insufficient-rights/build.gradle diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/insufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java b/qa/smoke-test-monitoring-with-security/insufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-monitoring-with-security/insufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java rename to qa/smoke-test-monitoring-with-security/insufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/roles.yml b/qa/smoke-test-monitoring-with-security/roles.yml similarity index 100% rename from elasticsearch/qa/smoke-test-monitoring-with-security/roles.yml rename to qa/smoke-test-monitoring-with-security/roles.yml diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/sufficient-rights/build.gradle b/qa/smoke-test-monitoring-with-security/sufficient-rights/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-monitoring-with-security/sufficient-rights/build.gradle rename to qa/smoke-test-monitoring-with-security/sufficient-rights/build.gradle diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/sufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java b/qa/smoke-test-monitoring-with-security/sufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-monitoring-with-security/sufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java rename to qa/smoke-test-monitoring-with-security/sufficient-rights/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle b/qa/smoke-test-plugins-ssl/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-plugins-ssl/build.gradle rename to qa/smoke-test-plugins-ssl/build.gradle diff --git a/elasticsearch/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java b/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java rename to qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java diff --git a/elasticsearch/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslClientYamlTestSuiteIT.java b/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslClientYamlTestSuiteIT.java rename to qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml b/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml rename to qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml diff --git a/elasticsearch/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/20_settings_filter.yaml b/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/20_settings_filter.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/20_settings_filter.yaml rename to qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/20_settings_filter.yaml diff --git a/elasticsearch/qa/smoke-test-plugins/build.gradle b/qa/smoke-test-plugins/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-plugins/build.gradle rename to qa/smoke-test-plugins/build.gradle diff --git a/elasticsearch/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/XSmokeTestPluginsClientYamlTestSuiteIT.java b/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/XSmokeTestPluginsClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/XSmokeTestPluginsClientYamlTestSuiteIT.java rename to qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/XSmokeTestPluginsClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml b/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml rename to qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml diff --git a/elasticsearch/qa/smoke-test-security-with-mustache/build.gradle b/qa/smoke-test-security-with-mustache/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-security-with-mustache/build.gradle rename to qa/smoke-test-security-with-mustache/build.gradle diff --git a/elasticsearch/qa/smoke-test-security-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestSecurityWithMustacheClientYamlTestSuiteIT.java b/qa/smoke-test-security-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestSecurityWithMustacheClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-security-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestSecurityWithMustacheClientYamlTestSuiteIT.java rename to qa/smoke-test-security-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestSecurityWithMustacheClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/10_templated_role_query.yaml b/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/10_templated_role_query.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/10_templated_role_query.yaml rename to qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/10_templated_role_query.yaml diff --git a/elasticsearch/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/20_small_users_one_index.yaml b/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/20_small_users_one_index.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/20_small_users_one_index.yaml rename to qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/templated_role_query/20_small_users_one_index.yaml diff --git a/elasticsearch/qa/smoke-test-security-with-mustache/src/test/resources/templates/query.mustache b/qa/smoke-test-security-with-mustache/src/test/resources/templates/query.mustache similarity index 100% rename from elasticsearch/qa/smoke-test-security-with-mustache/src/test/resources/templates/query.mustache rename to qa/smoke-test-security-with-mustache/src/test/resources/templates/query.mustache diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle b/qa/smoke-test-watcher-with-groovy/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle rename to qa/smoke-test-watcher-with-groovy/build.gradle diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java b/qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java rename to qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherWithGroovyIT.java b/qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherWithGroovyIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherWithGroovyIT.java rename to qa/smoke-test-watcher-with-groovy/src/test/java/org/elasticsearch/smoketest/WatcherWithGroovyIT.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/40_index_action.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/40_index_action.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/40_index_action.yaml rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/40_index_action.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/50_script_condition.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle b/qa/smoke-test-watcher-with-mustache/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle rename to qa/smoke-test-watcher-with-mustache/build.gradle diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestWatchesWithMustacheClientYamlTestSuiteTestCase.java b/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestWatchesWithMustacheClientYamlTestSuiteTestCase.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestWatchesWithMustacheClientYamlTestSuiteTestCase.java rename to qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/SmokeTestWatchesWithMustacheClientYamlTestSuiteTestCase.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java b/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java rename to qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherWithMustacheIT.java b/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherWithMustacheIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherWithMustacheIT.java rename to qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherWithMustacheIT.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml b/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml rename to qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml b/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml rename to qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yaml b/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yaml rename to qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/40_search_transform.yaml b/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/40_search_transform.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/40_search_transform.yaml rename to qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/40_search_transform.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle b/qa/smoke-test-watcher-with-painless/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle rename to qa/smoke-test-watcher-with-painless/build.gradle diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java b/qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java rename to qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherRestTestCase.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherWithPainlessIT.java b/qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherWithPainlessIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherWithPainlessIT.java rename to qa/smoke-test-watcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherWithPainlessIT.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml rename to qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml rename to qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml rename to qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml diff --git a/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle b/qa/smoke-test-watcher-with-security/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-security/build.gradle rename to qa/smoke-test-watcher-with-security/build.gradle diff --git a/elasticsearch/qa/smoke-test-watcher-with-security/roles.yml b/qa/smoke-test-watcher-with-security/roles.yml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-security/roles.yml rename to qa/smoke-test-watcher-with-security/roles.yml diff --git a/elasticsearch/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java b/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java rename to qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-watcher-with-security/src/test/resources/rest-api-spec/test/watcher/watcher_and_security/10_insufficient_privs.yaml b/qa/smoke-test-watcher-with-security/src/test/resources/rest-api-spec/test/watcher/watcher_and_security/10_insufficient_privs.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher-with-security/src/test/resources/rest-api-spec/test/watcher/watcher_and_security/10_insufficient_privs.yaml rename to qa/smoke-test-watcher-with-security/src/test/resources/rest-api-spec/test/watcher/watcher_and_security/10_insufficient_privs.yaml diff --git a/elasticsearch/qa/smoke-test-watcher/build.gradle b/qa/smoke-test-watcher/build.gradle similarity index 100% rename from elasticsearch/qa/smoke-test-watcher/build.gradle rename to qa/smoke-test-watcher/build.gradle diff --git a/elasticsearch/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherClientYamlTestSuiteIT.java b/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherClientYamlTestSuiteIT.java similarity index 100% rename from elasticsearch/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherClientYamlTestSuiteIT.java rename to qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherClientYamlTestSuiteIT.java diff --git a/elasticsearch/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/watcher_getting_started/10_monitor_cluster_health.yaml b/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/watcher_getting_started/10_monitor_cluster_health.yaml similarity index 100% rename from elasticsearch/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/watcher_getting_started/10_monitor_cluster_health.yaml rename to qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/watcher_getting_started/10_monitor_cluster_health.yaml diff --git a/elasticsearch/qa/tribe-node-tests-with-security/integration-tests.xml b/qa/tribe-node-tests-with-security/integration-tests.xml similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/integration-tests.xml rename to qa/tribe-node-tests-with-security/integration-tests.xml diff --git a/elasticsearch/qa/tribe-node-tests-with-security/rest-api-spec/test/tribe_node/10_basic.yaml b/qa/tribe-node-tests-with-security/rest-api-spec/test/tribe_node/10_basic.yaml similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/rest-api-spec/test/tribe_node/10_basic.yaml rename to qa/tribe-node-tests-with-security/rest-api-spec/test/tribe_node/10_basic.yaml diff --git a/elasticsearch/qa/tribe-node-tests-with-security/roles.yml b/qa/tribe-node-tests-with-security/roles.yml similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/roles.yml rename to qa/tribe-node-tests-with-security/roles.yml diff --git a/elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpCondition.java b/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpCondition.java similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpCondition.java rename to qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpCondition.java diff --git a/elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpTask.java b/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpTask.java similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpTask.java rename to qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/ant/HttpTask.java diff --git a/elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/RestIT.java b/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/RestIT.java similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/RestIT.java rename to qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/RestIT.java diff --git a/elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/TribeRestTestCase.java b/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/TribeRestTestCase.java similarity index 100% rename from elasticsearch/qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/TribeRestTestCase.java rename to qa/tribe-node-tests-with-security/src/test/java/org/elasticsearch/xpack.security/TribeRestTestCase.java