diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
index 60c184473d5..6b7a85bbbfc 100644
--- a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
+++ b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
@@ -38,9 +38,9 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.text.Text;
 import org.elasticsearch.index.engine.DocumentMissingException;
-import org.elasticsearch.index.percolator.PercolateException;
-import org.elasticsearch.index.percolator.PercolatorService;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.percolator.PercolateException;
+import org.elasticsearch.percolator.PercolatorService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
index bebb71fd0f7..6dbb042ddab 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
@@ -37,12 +37,12 @@ import org.elasticsearch.index.Index;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.MergeMappingException;
-import org.elasticsearch.index.percolator.PercolatorService;
 import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.InvalidTypeNameException;
 import org.elasticsearch.indices.TypeMissingException;
+import org.elasticsearch.percolator.PercolatorService;
 
 import java.util.*;
 import java.util.concurrent.BlockingQueue;
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 3fd382c1d8c..3063f2e25fc 100644
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -47,12 +47,12 @@ import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.codec.postingsformat.PostingsFormatService;
 import org.elasticsearch.index.mapper.internal.TypeFieldMapper;
 import org.elasticsearch.index.mapper.object.ObjectMapper;
-import org.elasticsearch.index.percolator.PercolatorService;
 import org.elasticsearch.index.search.nested.NonNestedDocsFilter;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.index.similarity.SimilarityLookupService;
 import org.elasticsearch.indices.InvalidTypeNameException;
 import org.elasticsearch.indices.TypeMissingException;
+import org.elasticsearch.percolator.PercolatorService;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
index 8bd4c64aa22..7b88889728d 100644
--- a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
+++ b/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
@@ -31,6 +31,7 @@ import org.elasticsearch.index.shard.AbstractIndexShardComponent;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.service.IndexShard;
 import org.elasticsearch.indices.IndicesLifecycle;
+import org.elasticsearch.percolator.PercolatorService;
 
 import java.util.concurrent.ConcurrentMap;
 
diff --git a/src/main/java/org/elasticsearch/node/internal/InternalNode.java b/src/main/java/org/elasticsearch/node/internal/InternalNode.java
index ae24a58603b..a106904ddbb 100644
--- a/src/main/java/org/elasticsearch/node/internal/InternalNode.java
+++ b/src/main/java/org/elasticsearch/node/internal/InternalNode.java
@@ -63,8 +63,6 @@ import org.elasticsearch.gateway.GatewayModule;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.http.HttpServer;
 import org.elasticsearch.http.HttpServerModule;
-import org.elasticsearch.index.percolator.PercolatorModule;
-import org.elasticsearch.index.percolator.PercolatorService;
 import org.elasticsearch.index.search.shape.ShapeModule;
 import org.elasticsearch.indices.IndicesModule;
 import org.elasticsearch.indices.IndicesService;
@@ -77,6 +75,8 @@ import org.elasticsearch.monitor.MonitorModule;
 import org.elasticsearch.monitor.MonitorService;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.node.Node;
+import org.elasticsearch.percolator.PercolatorModule;
+import org.elasticsearch.percolator.PercolatorService;
 import org.elasticsearch.plugins.PluginsModule;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.rest.RestController;
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolateException.java b/src/main/java/org/elasticsearch/percolator/PercolateException.java
similarity index 93%
rename from src/main/java/org/elasticsearch/index/percolator/PercolateException.java
rename to src/main/java/org/elasticsearch/percolator/PercolateException.java
index 06e14b0aff8..ead7f0b7e59 100644
--- a/src/main/java/org/elasticsearch/index/percolator/PercolateException.java
+++ b/src/main/java/org/elasticsearch/percolator/PercolateException.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.index.percolator;
+package org.elasticsearch.percolator;
 
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.index.shard.ShardId;
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java b/src/main/java/org/elasticsearch/percolator/PercolatorModule.java
similarity index 95%
rename from src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java
rename to src/main/java/org/elasticsearch/percolator/PercolatorModule.java
index f1bef1a7df1..92e02d3486c 100644
--- a/src/main/java/org/elasticsearch/index/percolator/PercolatorModule.java
+++ b/src/main/java/org/elasticsearch/percolator/PercolatorModule.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.percolator;
+package org.elasticsearch.percolator;
 
 import org.elasticsearch.common.inject.AbstractModule;
 
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java b/src/main/java/org/elasticsearch/percolator/PercolatorService.java
similarity index 99%
rename from src/main/java/org/elasticsearch/index/percolator/PercolatorService.java
rename to src/main/java/org/elasticsearch/percolator/PercolatorService.java
index f33581b7ebb..578e5daf9a7 100644
--- a/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java
+++ b/src/main/java/org/elasticsearch/percolator/PercolatorService.java
@@ -16,7 +16,7 @@
  * the License.
  */
 
-package org.elasticsearch.index.percolator;
+package org.elasticsearch.percolator;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.index.IndexableField;
diff --git a/src/main/java/org/elasticsearch/index/percolator/QueryCollector.java b/src/main/java/org/elasticsearch/percolator/QueryCollector.java
similarity index 98%
rename from src/main/java/org/elasticsearch/index/percolator/QueryCollector.java
rename to src/main/java/org/elasticsearch/percolator/QueryCollector.java
index 4cd4c47a565..063a8303d3a 100644
--- a/src/main/java/org/elasticsearch/index/percolator/QueryCollector.java
+++ b/src/main/java/org/elasticsearch/percolator/QueryCollector.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.index.percolator;
+package org.elasticsearch.percolator;
 
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.search.Collector;