diff --git a/docs/src/docbkx/chap-administration.xml b/docs/src/docbkx/chap-administration.xml
index f9ca4ec63..299ae238e 100644
--- a/docs/src/docbkx/chap-administration.xml
+++ b/docs/src/docbkx/chap-administration.xml
@@ -226,7 +226,7 @@
DiskFreeSpaceBytes, DiskIndexSizeBytes, LastOptimizationTime, LastDiskIndexModifiedTime, IndexDir, DiskIndexSegmentCount
@@ -234,7 +234,7 @@
LastIndexingBatchSize, LastIndexingBatchDuration, LastIndexingEndTime
diff --git a/docs/src/docbkx/chap-configuration.xml b/docs/src/docbkx/chap-configuration.xml
index 3c7967b6f..c8cd11456 100644
--- a/docs/src/docbkx/chap-configuration.xml
+++ b/docs/src/docbkx/chap-configuration.xml
@@ -742,7 +742,7 @@ sensei.indexer.type=zoie
# sensei
# version comparator, default: ZoieConfig.DefaultVersionComparator
-# sensei.version.comparator.class = proj.zoie.impl.indexing.ZoieConfig$DefaultVersionComparator
+# sensei.version.comparator.class = com.linkedin.zoie.impl.indexing.ZoieConfig$DefaultVersionComparator
# extra services
sensei.plugin.services.list =
@@ -2479,7 +2479,7 @@ sensei.custom.facets.list= virtual_groupids, my.custom_facets.tags, groupid
This is the bean ID of the
- proj.zoie.dataprovider.jms.TopicFactory
+ com.linkedin.zoie.dataprovider.jms.TopicFactory
object. This object is used to generate a topic object based on
the given topic name.
@@ -2547,9 +2547,9 @@ sensei.custom.facets.list= virtual_groupids, my.custom_facets.tags, groupid This is the bean ID of the
com.sensei.indexing.api.jdbc.SenseiJDBCAdaptor
object. This object is used to build a
- proj.zoie.dataprovider.jdbc.PreparedStatementBuilder
+ com.linkedin.zoie.dataprovider.jdbc.PreparedStatementBuilder
object, which is required by
- proj.zoie.dataprovider.jdbc.JDBCStreamDataProvider.
+ com.linkedin.zoie.dataprovider.jdbc.JDBCStreamDataProvider.
diff --git a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java
index ea290a41a..1ef48d631 100644
--- a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java
+++ b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java
@@ -5,7 +5,7 @@
import org.json.JSONObject;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java
index 6a4a72171..c75868b4b 100644
--- a/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java
+++ b/example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java
@@ -16,8 +16,8 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
public class TwitterSampleStreamer extends StreamDataProvider {
diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java
index aa3710a64..0ddc1415a 100644
--- a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java
+++ b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java
@@ -7,8 +7,8 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.sensei.indexing.api.DataSourceFilter;
import com.sensei.indexing.api.DataSourceFilterable;
diff --git a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java
index 2f70cf71d..512a86c18 100644
--- a/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java
+++ b/perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java
@@ -7,7 +7,7 @@
import org.json.JSONObject;
import org.springframework.context.ApplicationContext;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.sensei.indexing.api.DataSourceFilter;
import com.sensei.indexing.api.gateway.SenseiGateway;
diff --git a/resources/log4j.properties b/resources/log4j.properties
index 40524d688..1908c8b3e 100644
--- a/resources/log4j.properties
+++ b/resources/log4j.properties
@@ -65,6 +65,6 @@ log4j.appender.sensei-norbert.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SS
log4j.logger.com.sensei=INFO,sensei
log4j.logger.com.linkedin.norbert=INFO,sensei-norbert
-log4j.logger.proj.zoie=INFO,sensei-zoie
+log4j.logger.com.linkedin.zoie=INFO,sensei-zoie
log4j.logger.com.browseengine.bobo=INFO,sensei-bobo
log4j.logger.com.sensei.querylog=INFO,sensei-query
diff --git a/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java b/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java
index 95277784d..d48fb3b5e 100644
--- a/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java
+++ b/sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java
@@ -47,14 +47,14 @@
import org.springframework.core.io.Resource;
import org.w3c.dom.Document;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.IndexCopier;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
-import proj.zoie.impl.indexing.DefaultReaderCache;
-import proj.zoie.impl.indexing.ReaderCacheFactory;
-import proj.zoie.impl.indexing.SimpleReaderCache;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.IndexCopier;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
+import com.linkedin.zoie.impl.indexing.DefaultReaderCache;
+import com.linkedin.zoie.impl.indexing.ReaderCacheFactory;
+import com.linkedin.zoie.impl.indexing.SimpleReaderCache;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.browseengine.bobo.facets.FacetHandler;
import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
diff --git a/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java b/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java
index 00783188b..c2b65adc1 100644
--- a/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java
+++ b/sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java
@@ -2,8 +2,8 @@
import java.io.File;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.search.node.SenseiIndexReaderDecorator;
import com.senseidb.search.node.SenseiZoieFactory;
diff --git a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java
index 4b35e07f6..d55a615bf 100644
--- a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java
+++ b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java
@@ -1,6 +1,6 @@
package com.senseidb.dataprovider.http;
-import proj.zoie.mbean.DataProviderAdminMBean;
+import com.linkedin.zoie.mbean.DataProviderAdminMBean;
public interface HttpDataProviderAdminMBean extends DataProviderAdminMBean {
diff --git a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java
index 6790445cb..8ecf1139a 100644
--- a/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java
+++ b/sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java
@@ -32,8 +32,8 @@
import org.apache.http.protocol.HttpContext;
import org.apache.log4j.Logger;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
public abstract class HttpStreamDataProvider extends StreamDataProvider implements HttpDataProviderAdminMBean{
diff --git a/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java b/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java
index 012227a06..f89cba269 100644
--- a/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java
+++ b/sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java
@@ -12,8 +12,8 @@
import org.apache.lucene.util.Version;
import org.json.JSONObject;
-import proj.zoie.api.indexing.ZoieIndexable;
-import proj.zoie.api.indexing.ZoieIndexable.IndexingReq;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq;
import com.senseidb.conf.SenseiSchema;
import com.senseidb.conf.SenseiServerBuilder;
diff --git a/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java b/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java
index 90aecf1f1..2cd350e6f 100644
--- a/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java
+++ b/sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java
@@ -5,8 +5,8 @@
import org.json.JSONObject;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.conf.SenseiSchema;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java
index 02a872bff..1f221d344 100644
--- a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java
+++ b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java
@@ -10,8 +10,8 @@
import org.apache.log4j.Logger;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
public abstract class LinedFileDataProvider extends StreamDataProvider {
diff --git a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java
index 77d572831..1ceaf2f6d 100644
--- a/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java
+++ b/sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java
@@ -6,8 +6,8 @@
import org.json.JSONObject;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java
index 19b9e9879..4f2930e57 100644
--- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java
+++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java
@@ -24,9 +24,9 @@
import org.json.JSONException;
import org.json.JSONObject;
-import proj.zoie.api.indexing.AbstractZoieIndexable;
-import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
-import proj.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
import com.senseidb.conf.SenseiSchema;
import com.senseidb.conf.SenseiSchema.FieldDefinition;
diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java
index f4eef8116..31d3483d8 100644
--- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java
+++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java
@@ -18,8 +18,8 @@
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
-import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
-import proj.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
import com.browseengine.bobo.facets.data.PredefinedTermListFactory;
import com.browseengine.bobo.facets.data.TermListFactory;
diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java
index 50503366c..b9f7026b3 100644
--- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java
+++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java
@@ -13,8 +13,8 @@
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
-import proj.zoie.api.indexing.AbstractZoieIndexable;
-import proj.zoie.api.indexing.ZoieIndexable.IndexingReq;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
+import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq;
import com.senseidb.indexing.DefaultSenseiInterpreter.IndexSpec;
import com.senseidb.indexing.DefaultSenseiInterpreter.MetaFormatSpec;
diff --git a/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java b/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java
index e8eb6e884..511a3b966 100644
--- a/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java
+++ b/sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java
@@ -16,16 +16,16 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.api.DataProvider;
-import proj.zoie.api.Zoie;
-import proj.zoie.api.ZoieException;
-import proj.zoie.api.ZoieIndexReader;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
-import proj.zoie.mbean.DataProviderAdmin;
-import proj.zoie.mbean.DataProviderAdminMBean;
+import com.linkedin.zoie.api.DataConsumer;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.api.DataProvider;
+import com.linkedin.zoie.api.Zoie;
+import com.linkedin.zoie.api.ZoieException;
+import com.linkedin.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.mbean.DataProviderAdmin;
+import com.linkedin.zoie.mbean.DataProviderAdminMBean;
import com.browseengine.bobo.api.BoboIndexReader;
import com.senseidb.conf.SenseiSchema;
@@ -300,7 +300,7 @@ else if (type != null)
}
@Override
- public void consume(Collection> data) throws ZoieException
+ public void consume(Collection> data) throws ZoieException
{
UpdateBatchSizeMeter.mark(data.size());
ProviderBatchSizeMeter.mark(_dataProvider.getBatchSize());
diff --git a/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java
index b4a84e8d3..9087b34a0 100644
--- a/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java
+++ b/sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java
@@ -4,9 +4,9 @@
import org.json.JSONException;
import org.json.JSONObject;
-import proj.zoie.api.indexing.AbstractZoieIndexable;
-import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
-import proj.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
public abstract class JSONDataInterpreter extends AbstractZoieIndexableInterpreter {
diff --git a/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java b/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java
index 3a5b4bdf3..2f13acd0d 100644
--- a/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java
+++ b/sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java
@@ -2,8 +2,8 @@
import org.json.JSONObject;
-import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
-import proj.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
public abstract class JSONValueInterpreter extends
AbstractZoieIndexableInterpreter {
diff --git a/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java b/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java
index 1b683f777..e870a42e2 100644
--- a/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java
+++ b/sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java
@@ -14,9 +14,9 @@
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.ScoreDoc;
-import proj.zoie.api.DocIDMapper;
-import proj.zoie.api.ZoieIndexReader;
-import proj.zoie.api.ZoieSegmentReader;
+import com.linkedin.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.ZoieSegmentReader;
import scala.actors.threadpool.Arrays;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java b/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java
index 9832b5659..7f27192f3 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java
@@ -1,7 +1,7 @@
package com.senseidb.search.node;
-import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
-import proj.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
public class NoOpIndexableInterpreter extends
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java b/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java
index 923e25d5f..507edb5cf 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java
@@ -21,7 +21,7 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.PriorityQueue;
-import proj.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.ZoieIndexReader;
import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.api.BrowseFacet;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java
index 15736e95a..6af35a93e 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java
@@ -10,7 +10,7 @@
import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
-import proj.zoie.api.indexing.AbstractZoieIndexable;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
import com.browseengine.bobo.api.FacetSpec;
import com.linkedin.norbert.NorbertException;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java
index 4ee1c9bd4..17ae664b2 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java
@@ -8,11 +8,11 @@
import org.apache.log4j.Logger;
-import proj.zoie.api.DataProvider;
-import proj.zoie.api.IndexReaderFactory;
-import proj.zoie.api.Zoie;
-import proj.zoie.api.ZoieException;
-import proj.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.DataProvider;
+import com.linkedin.zoie.api.IndexReaderFactory;
+import com.linkedin.zoie.api.Zoie;
+import com.linkedin.zoie.api.ZoieException;
+import com.linkedin.zoie.api.ZoieIndexReader;
import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.facets.FacetHandler;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java
index 7ff81830a..f0a40e545 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java
@@ -4,13 +4,13 @@
import org.apache.log4j.Logger;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.hourglass.impl.HourGlassScheduler;
-import proj.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
-import proj.zoie.hourglass.impl.Hourglass;
-import proj.zoie.hourglass.impl.HourglassDirectoryManagerFactory;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.hourglass.impl.HourGlassScheduler;
+import com.linkedin.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
+import com.linkedin.zoie.hourglass.impl.Hourglass;
+import com.linkedin.zoie.hourglass.impl.HourglassDirectoryManagerFactory;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java
index 2020a1ed9..aacfda2a7 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java
@@ -5,8 +5,8 @@
import org.apache.log4j.Logger;
-import proj.zoie.api.ZoieIndexReader;
-import proj.zoie.impl.indexing.AbstractIndexReaderDecorator;
+import com.linkedin.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.impl.indexing.AbstractIndexReaderDecorator;
import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.facets.FacetHandler;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java
index 8bb5496bd..b0fc98b0b 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java
@@ -2,9 +2,9 @@
import java.util.Map;
-import proj.zoie.api.DataProvider;
-import proj.zoie.api.Zoie;
-import proj.zoie.api.ZoieException;
+import com.linkedin.zoie.api.DataProvider;
+import com.linkedin.zoie.api.Zoie;
+import com.linkedin.zoie.api.ZoieException;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java
index 082d65fdb..8ef4af18f 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiPairFactory.java
@@ -4,12 +4,12 @@
import org.apache.log4j.Logger;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.IndexCopier;
-import proj.zoie.api.Zoie;
-import proj.zoie.impl.indexing.ZoieConfig;
-import proj.zoie.pair.impl.Pair;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.IndexCopier;
+import com.linkedin.zoie.api.Zoie;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.pair.impl.Pair;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java
index a46abb061..f4dca5ba5 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiServer.java
@@ -12,7 +12,7 @@
import org.apache.log4j.Logger;
import org.mortbay.jetty.Server;
-import proj.zoie.api.DataProvider;
+import com.linkedin.zoie.api.DataProvider;
import scala.actors.threadpool.Arrays;
import com.linkedin.norbert.javacompat.cluster.ClusterClient;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java
index cc56ea339..70c3f10f0 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieFactory.java
@@ -3,10 +3,10 @@
import java.io.File;
import java.util.Comparator;
-import proj.zoie.api.Zoie;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.Zoie;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java
index 2ca2b82d9..26d9f0a6c 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/SenseiZoieSystemFactory.java
@@ -8,14 +8,14 @@
import org.apache.log4j.Logger;
import org.apache.lucene.search.Filter;
-import proj.zoie.api.DefaultDirectoryManager;
-import proj.zoie.api.DirectoryManager;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.indexing.IndexingEventListener;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.impl.indexing.IndexUpdatedEvent;
-import proj.zoie.impl.indexing.ZoieConfig;
-import proj.zoie.impl.indexing.ZoieSystem;
+import com.linkedin.zoie.api.DefaultDirectoryManager;
+import com.linkedin.zoie.api.DirectoryManager;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.indexing.IndexingEventListener;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.impl.indexing.IndexUpdatedEvent;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.impl.indexing.ZoieSystem;
import com.browseengine.bobo.api.BoboIndexReader;
import com.senseidb.metrics.MetricsConstants;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java
index 22b46f965..7e0e995f5 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/CompositeDataConsumer.java
@@ -5,8 +5,8 @@
import java.util.LinkedList;
import java.util.List;
-import proj.zoie.api.DataConsumer;
-import proj.zoie.api.ZoieException;
+import com.linkedin.zoie.api.DataConsumer;
+import com.linkedin.zoie.api.ZoieException;
public class CompositeDataConsumer implements DataConsumer {
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java
index 9fc1e9c2f..103511be6 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/DemoZoieSystemFactory.java
@@ -2,10 +2,10 @@
import java.io.File;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.impl.indexing.ZoieConfig;
-import proj.zoie.impl.indexing.ZoieSystem;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.impl.indexing.ZoieSystem;
import com.browseengine.bobo.api.BoboIndexReader;
import com.senseidb.conf.ZoieFactoryFactory;
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java
index 9f535a46d..c3cc27873 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/JSONDataSerializer.java
@@ -7,7 +7,7 @@
import com.senseidb.conf.SenseiSchema;
-import proj.zoie.store.ZoieStoreSerializer;
+import com.linkedin.zoie.store.ZoieStoreSerializer;
public class JSONDataSerializer implements ZoieStoreSerializer{
diff --git a/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java b/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java
index a6e915981..d93080053 100644
--- a/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java
+++ b/sensei-core/src/main/java/com/senseidb/search/node/impl/NoopIndexingManager.java
@@ -2,9 +2,9 @@
import java.util.Map;
-import proj.zoie.api.DataProvider;
-import proj.zoie.api.Zoie;
-import proj.zoie.api.ZoieException;
+import com.linkedin.zoie.api.DataProvider;
+import com.linkedin.zoie.api.Zoie;
+import com.linkedin.zoie.api.ZoieException;
import com.browseengine.bobo.api.BoboIndexReader;
import com.senseidb.search.node.SenseiIndexingManager;
diff --git a/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java b/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java
index 047c716f5..359d47ab3 100644
--- a/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java
+++ b/sensei-core/src/main/java/com/senseidb/search/query/TimeRetentionFilter.java
@@ -10,7 +10,7 @@
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
-import proj.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.ZoieIndexReader;
import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.api.BrowseSelection;
diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java
index 8abb60092..a29aa2da5 100644
--- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java
+++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/FieldAccessor.java
@@ -5,7 +5,7 @@
import java.util.Map;
import java.util.Set;
-import proj.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.DocIDMapper;
import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.facets.FacetHandler;
diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java
index c115f09f8..2bac27115 100644
--- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java
+++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/SenseiMapReduce.java
@@ -6,7 +6,7 @@
import org.json.JSONObject;
-import proj.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.DocIDMapper;
public interface SenseiMapReduce extends Serializable {
public void init(JSONObject params);
diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java
index 0d24c13b7..93262eb43 100644
--- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java
+++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/impl/SenseiMapFunctionWrapper.java
@@ -2,8 +2,8 @@
import java.util.Set;
-import proj.zoie.api.ZoieSegmentReader;
-import proj.zoie.api.impl.DocIDMapperImpl;
+import com.linkedin.zoie.api.ZoieSegmentReader;
+import com.linkedin.zoie.api.impl.DocIDMapperImpl;
import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.mapred.BoboMapFunctionWrapper;
diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java
index 3780aa886..444faa3c9 100644
--- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java
+++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceJob.java
@@ -7,7 +7,7 @@
import com.senseidb.search.req.mapred.FieldAccessor;
-import proj.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.DocIDMapper;
public interface MapReduceJob extends Serializable{
public MapResult map(long[] uids, DocIDMapper docIDMapper, FieldAccessor fieldAccessor);
diff --git a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java
index 4965d413e..284956867 100644
--- a/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java
+++ b/sensei-core/src/main/java/com/senseidb/search/req/mapred/obsolete/MapReduceSenseiService.java
@@ -5,8 +5,8 @@
import org.apache.log4j.Logger;
-import proj.zoie.api.DocIDMapper;
-import proj.zoie.api.ZoieSegmentReader;
+import com.linkedin.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.ZoieSegmentReader;
import com.browseengine.bobo.api.BoboBrowser;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java b/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java
index 6c19484ea..d48d0af75 100644
--- a/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java
+++ b/sensei-core/src/main/java/com/senseidb/svc/impl/AbstractSenseiCoreService.java
@@ -16,8 +16,8 @@
import org.apache.log4j.Logger;
import org.apache.lucene.util.NamedThreadFactory;
-import proj.zoie.api.IndexReaderFactory;
-import proj.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.IndexReaderFactory;
+import com.linkedin.zoie.api.ZoieIndexReader;
import com.browseengine.bobo.api.BoboIndexReader;
import com.linkedin.norbert.network.Serializer;
diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java
index 54868dcbb..13a4caaf7 100644
--- a/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java
+++ b/sensei-core/src/main/java/com/senseidb/svc/impl/CoreSenseiServiceImpl.java
@@ -11,9 +11,9 @@
import org.apache.log4j.Logger;
import org.apache.lucene.search.Query;
-import proj.zoie.api.ZoieIndexReader;
-import proj.zoie.api.ZoieIndexReader.SubReaderAccessor;
-import proj.zoie.api.ZoieIndexReader.SubReaderInfo;
+import com.linkedin.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.ZoieIndexReader.SubReaderAccessor;
+import com.linkedin.zoie.api.ZoieIndexReader.SubReaderInfo;
import com.browseengine.bobo.api.BoboBrowser;
import com.browseengine.bobo.api.BoboIndexReader;
diff --git a/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java b/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java
index 276d4c65c..29f2cbeb0 100644
--- a/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java
+++ b/sensei-core/src/main/java/com/senseidb/svc/impl/LocalQueryOnlySenseiServiceImpl.java
@@ -7,10 +7,10 @@
import org.apache.lucene.util.Version;
import org.json.JSONObject;
-import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
-import proj.zoie.api.indexing.ZoieIndexable;
-import proj.zoie.impl.indexing.SimpleReaderCache;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.impl.indexing.SimpleReaderCache;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.search.node.SenseiCore;
import com.senseidb.search.node.impl.DefaultJsonQueryBuilderFactory;
diff --git a/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java b/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java
index 59652dd01..caa21441d 100644
--- a/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java
+++ b/sensei-core/src/main/java/com/senseidb/util/HDFSIndexCopier.java
@@ -24,7 +24,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.log4j.Logger;
-import proj.zoie.api.IndexCopier;
+import com.linkedin.zoie.api.IndexCopier;
public class HDFSIndexCopier implements IndexCopier
{
diff --git a/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java b/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java
index 1e0796bdb..22188a607 100644
--- a/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java
+++ b/sensei-core/src/test/java/com/senseidb/search/req/mapred/CountGroupByMapReduce.java
@@ -10,7 +10,7 @@
import org.json.JSONObject;
-import proj.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.DocIDMapper;
import com.senseidb.search.req.mapred.CountGroupByMapReduce.GroupedValue;
import com.senseidb.search.req.mapred.CountGroupByMapReduce.IntContainer;
diff --git a/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java b/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java
index a2cdfd42d..a296cc5af 100644
--- a/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java
+++ b/sensei-core/src/test/java/com/senseidb/search/req/mapred/MaxTestMapReduce.java
@@ -7,7 +7,7 @@
import com.senseidb.search.req.mapred.obsolete.MapReduceJob;
-import proj.zoie.api.DocIDMapper;
+import com.linkedin.zoie.api.DocIDMapper;
public class MaxTestMapReduce implements MapReduceJob {
private static final long serialVersionUID = 1L;
diff --git a/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java b/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java
index 55ed294b1..970c5563a 100644
--- a/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java
+++ b/sensei-core/src/test/java/com/senseidb/test/TestIndexingAPI.java
@@ -19,8 +19,8 @@
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
-import proj.zoie.api.indexing.ZoieIndexable;
-import proj.zoie.api.indexing.ZoieIndexable.IndexingReq;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq;
import com.senseidb.indexing.DefaultSenseiInterpreter;
import com.senseidb.indexing.DeleteChecker;
diff --git a/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java b/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java
index 509b07759..49cdd2983 100644
--- a/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java
+++ b/sensei-core/src/test/java/com/senseidb/test/ZoieTestFactory.java
@@ -2,10 +2,10 @@
import java.io.File;
-import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
-import proj.zoie.api.indexing.ZoieIndexableInterpreter;
-import proj.zoie.impl.indexing.ZoieConfig;
-import proj.zoie.impl.indexing.ZoieSystem;
+import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
+import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.impl.indexing.ZoieSystem;
import com.browseengine.bobo.api.BoboIndexReader;
import com.senseidb.search.node.SenseiIndexReaderDecorator;
diff --git a/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java b/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java
index 511611d91..7471c157f 100644
--- a/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java
+++ b/sensei-core/src/test/java/com/senseidb/test/plugin/VirtualGroupIdFactory.java
@@ -12,7 +12,7 @@
import com.senseidb.plugin.SenseiPluginFactory;
import com.senseidb.plugin.SenseiPluginRegistry;
-import proj.zoie.api.ZoieIndexReader;
+import com.linkedin.zoie.api.ZoieIndexReader;
public class VirtualGroupIdFactory implements SenseiPluginFactory {
@Override
diff --git a/sensei-core/src/test/resources/test-conf/zoie.spring b/sensei-core/src/test/resources/test-conf/zoie.spring
index b86a092a9..a2f843cff 100644
--- a/sensei-core/src/test/resources/test-conf/zoie.spring
+++ b/sensei-core/src/test/resources/test-conf/zoie.spring
@@ -28,7 +28,7 @@
-
+
diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java b/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java
index c55b3dcae..13cfad309 100644
--- a/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java
+++ b/sensei-gateways/src/main/java/com/senseidb/gateway/jdbc/JdbcDataProviderBuilder.java
@@ -12,12 +12,12 @@
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.dataprovider.jdbc.JDBCConnectionFactory;
-import proj.zoie.dataprovider.jdbc.JDBCStreamDataProvider;
-import proj.zoie.dataprovider.jdbc.PreparedStatementBuilder;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.dataprovider.jdbc.JDBCConnectionFactory;
+import com.linkedin.zoie.dataprovider.jdbc.JDBCStreamDataProvider;
+import com.linkedin.zoie.dataprovider.jdbc.PreparedStatementBuilder;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java b/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java
index 5fb44be8c..2a12553d4 100644
--- a/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java
+++ b/sensei-gateways/src/main/java/com/senseidb/gateway/jms/JmsDataProviderBuilder.java
@@ -10,12 +10,12 @@
import org.apache.commons.configuration.ConfigurationException;
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.dataprovider.jms.DataEventBuilder;
-import proj.zoie.dataprovider.jms.JMSStreamDataProvider;
-import proj.zoie.dataprovider.jms.TopicFactory;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.dataprovider.jms.DataEventBuilder;
+import com.linkedin.zoie.dataprovider.jms.JMSStreamDataProvider;
+import com.linkedin.zoie.dataprovider.jms.TopicFactory;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java
index 49aaa5d4d..43bad7d89 100644
--- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java
+++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaDataProviderBuilder.java
@@ -5,8 +5,8 @@
import org.json.JSONObject;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java
index 933d2a43d..98cd94846 100644
--- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java
+++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/KafkaStreamDataProvider.java
@@ -17,8 +17,8 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java
index e78730021..3ac03b05d 100644
--- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java
+++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaGateway.java
@@ -5,7 +5,7 @@
import org.json.JSONObject;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java
index 23be8b1a5..c456f9dd5 100644
--- a/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java
+++ b/sensei-gateways/src/main/java/com/senseidb/gateway/kafka/SimpleKafkaStreamDataProvider.java
@@ -12,8 +12,8 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import scala.collection.Iterator;
import com.senseidb.indexing.DataSourceFilter;
diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java b/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java
index 6ae9158bd..9ed19a3f3 100644
--- a/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java
+++ b/sensei-gateways/src/test/java/com/senseidb/gateway/perf/PerfDriver.java
@@ -6,10 +6,10 @@
import java.util.Iterator;
import java.util.Map;
-import proj.zoie.api.DataConsumer;
-import proj.zoie.api.ZoieException;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.DataConsumer;
+import com.linkedin.zoie.api.ZoieException;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.gateway.file.LinedFileDataProviderBuilder;
diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java b/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java
index 5482f89b6..49b2a28d3 100644
--- a/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java
+++ b/sensei-gateways/src/test/java/com/senseidb/gateway/test/BaseGatewayTestUtil.java
@@ -15,11 +15,11 @@
import org.json.JSONObject;
import org.junit.BeforeClass;
-import proj.zoie.api.DataConsumer;
-import proj.zoie.api.ZoieException;
-import proj.zoie.api.DataConsumer.DataEvent;
-import proj.zoie.impl.indexing.StreamDataProvider;
-import proj.zoie.impl.indexing.ZoieConfig;
+import com.linkedin.zoie.api.DataConsumer;
+import com.linkedin.zoie.api.ZoieException;
+import com.linkedin.zoie.api.DataConsumer.DataEvent;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.plugin.SenseiPluginRegistry;
diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java
index 839d497ac..62a34ac87 100644
--- a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java
+++ b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestJDBCGateway.java
@@ -12,7 +12,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.gateway.test.jdbc.ResultSetJsonFilter;
diff --git a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java
index dd45694f8..a535f47a3 100644
--- a/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java
+++ b/sensei-gateways/src/test/java/com/senseidb/gateway/test/TestKafkaGateway.java
@@ -22,7 +22,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import proj.zoie.impl.indexing.StreamDataProvider;
+import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.senseidb.gateway.SenseiGateway;
import com.senseidb.gateway.kafka.DefaultJsonDataSourceFilter;
diff --git a/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java b/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java
index 7f40f7d4c..56ec00a47 100644
--- a/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java
+++ b/sensei-hadoop-indexing/src/main/java/com/senseidb/indexing/hadoop/map/SenseiMapper.java
@@ -29,10 +29,10 @@
import org.json.JSONException;
import org.json.JSONObject;
-import proj.zoie.api.ZoieSegmentReader;
-import proj.zoie.api.indexing.AbstractZoieIndexable;
-import proj.zoie.api.indexing.ZoieIndexable;
-import proj.zoie.api.indexing.ZoieIndexable.IndexingReq;
+import com.linkedin.zoie.api.ZoieSegmentReader;
+import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
+import com.linkedin.zoie.api.indexing.ZoieIndexable;
+import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq;
import com.senseidb.conf.SchemaConverter;
import com.senseidb.conf.SenseiSchema;