diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/Graph.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/Graph.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/Graph.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/GraphFeatureSet.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/Connection.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreAction.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequestBuilder.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreResponse.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/Hop.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/Vertex.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/VertexRequest.java
diff --git a/elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java
similarity index 100%
rename from elasticsearch/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java
rename to elasticsearch/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java
diff --git a/elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java
similarity index 100%
rename from elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/xpack/graph/GraphFeatureSetTests.java
diff --git a/elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java
similarity index 100%
rename from elasticsearch/graph/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java
rename to elasticsearch/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java
diff --git a/elasticsearch/graph/src/test/resources/rest-api-spec/api/xpack.graph.explore.json b/elasticsearch/src/test/resources/rest-api-spec/api/xpack.graph.explore.json
similarity index 100%
rename from elasticsearch/graph/src/test/resources/rest-api-spec/api/xpack.graph.explore.json
rename to elasticsearch/src/test/resources/rest-api-spec/api/xpack.graph.explore.json
diff --git a/elasticsearch/graph/src/test/resources/rest-api-spec/test/graph/10_basic.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/graph/10_basic.yaml
similarity index 100%
rename from elasticsearch/graph/src/test/resources/rest-api-spec/test/graph/10_basic.yaml
rename to elasticsearch/src/test/resources/rest-api-spec/test/graph/10_basic.yaml