diff --git a/plugin.xml b/plugin.xml
index 04facf49ff105d7d4b8055219d8fc567e5ce6bef..179c5fe6203ef7add7badf95eeedf94c9bd11ccf 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,7 +5,9 @@
 
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
-	<property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" />
+	<!-- property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" / -->
+	<!-- WORKAROUND -->
+	<property name="maven.release.repo.url" value="https://maven.codelibs.org" />
 
 	<target name="install.plugins">
 		<mkdir dir="${target.dir}" />
@@ -14,7 +16,7 @@
 		<!-- analysis-extension -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
+			<param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-extension" />
 			<param name="plugin.version" value="7.10.0" />
@@ -23,7 +25,7 @@
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
+			<param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-fess" />
 			<param name="plugin.version" value="7.10.0" />
@@ -32,7 +34,7 @@
 		<!-- configsync -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
+			<param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
 			<param name="plugin.version" value="7.10.0" />
@@ -41,7 +43,7 @@
 		<!-- dataformat -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
+			<param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="dataformat" />
 			<param name="plugin.version" value="7.10.0" />
@@ -50,7 +52,7 @@
 		<!-- minhash -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
+			<param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="minhash" />
 			<param name="plugin.version" value="7.10.0" />
diff --git a/pom.xml b/pom.xml
index f794c3c34998d246fafeb0de8013956c1aa083a4..3f2673eb171392cbf61d15d77f4e5334c682a53e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codelibs.fess</groupId>
 	<artifactId>fess</artifactId>
-	<version>13.10.3-SNAPSHOT</version>
+	<version>13.11.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Fess</name>
 	<description>Fess is Full tExt Search System.</description>
@@ -54,15 +54,15 @@
 		<okhttp.version>3.14.9</okhttp.version>
 
 		<!-- Crawler -->
-		<crawler.version>3.10.1</crawler.version>
+		<crawler.version>3.11.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>7.10.0</suggest.version>
+		<suggest.version>7.11.0-SNAPSHOT</suggest.version>
 
-		<!-- Elasticsearch -->
-		<elasticsearch.version>7.10.1</elasticsearch.version>
-		<elasticsearch.httpclient.version>7.10.0</elasticsearch.httpclient.version>
-		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
+		<!-- Fesen -->
+		<fesen.version>0.10.0-SNAPSHOT</fesen.version>
+		<fesen.httpclient.version>0.10.0-SNAPSHOT</fesen.httpclient.version>
+		<fesen.runner.version>0.10.0-SNAPSHOT</fesen.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>9.0.41</tomcat.version>
@@ -90,7 +90,7 @@
 		<packaging.fess.systemd.dir>/usr/lib/systemd/system</packaging.fess.systemd.dir>
 		<packaging.fess.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.fess.systemd.sysctl.dir>
 		<packaging.fess.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.fess.tmpfilesd.dir>
-		<packaging.fess.dictionary.dir>/var/lib/elasticsearch/config</packaging.fess.dictionary.dir>
+		<packaging.fess.dictionary.dir>/var/lib/fesen/config</packaging.fess.dictionary.dir>
 
 	</properties>
 	<profiles>
@@ -1082,16 +1082,16 @@
 			<version>${log4j.version}</version>
 		</dependency>
 
-		<!-- elasticsearch -->
+		<!-- fesen -->
 		<dependency>
-			<groupId>org.elasticsearch</groupId>
-			<artifactId>elasticsearch</artifactId>
-			<version>${elasticsearch.version}</version>
+			<groupId>org.codelibs.fesen</groupId>
+			<artifactId>fesen-engine-server</artifactId>
+			<version>${fesen.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codelibs</groupId>
-			<artifactId>elasticsearch-cluster-runner</artifactId>
-			<version>${cluster.runner.version}</version>
+			<groupId>org.codelibs.fesen</groupId>
+			<artifactId>fesen-runner</artifactId>
+			<version>${fesen.runner.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.ow2.asm</groupId>
@@ -1116,9 +1116,9 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.codelibs</groupId>
-			<artifactId>elasticsearch-httpclient</artifactId>
-			<version>${elasticsearch.httpclient.version}</version>
+			<groupId>org.codelibs.fesen.client</groupId>
+			<artifactId>fesen-httpclient</artifactId>
+			<version>${fesen.httpclient.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
index 81d1a4aa55d8b8a6fec707d5dba202c44cd28152..8ff707f7bc512f303144c6e7fbc1a4e18cee8766 100644
--- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
@@ -34,6 +34,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.api.BaseJsonApiManager;
 import org.codelibs.fess.app.service.FavoriteLogService;
@@ -59,7 +60,6 @@ import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.FacetResponse;
 import org.codelibs.fess.util.FacetResponse.Field;
 import org.dbflute.optional.OptionalThing;
-import org.elasticsearch.script.Script;
 
 public class JsonApiManager extends BaseJsonApiManager {
 
diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
index 2612d279f8cc021c87702d524de2cda5228cb403..829010f726defaf35189d3cacb29d18770186020 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@@ -33,6 +33,13 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.BucketOrder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.Histogram;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
+import org.codelibs.fesen.search.aggregations.metrics.Avg;
+import org.codelibs.fesen.search.aggregations.metrics.Cardinality;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SearchLogPager;
 import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
@@ -53,13 +60,6 @@ import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.BucketOrder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
-import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.metrics.Avg;
-import org.elasticsearch.search.aggregations.metrics.Cardinality;
 
 public class SearchLogService {
 
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
index 00589388c1f967276b70ea8b9424517bf8485528..8bbc56f80102be84acf60e5e621a4972344240eb 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@@ -35,13 +35,13 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.CopyUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.curl.CurlResponse;
+import org.codelibs.fesen.action.ActionListener;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.mylasta.direction.FessConfig.SimpleImpl;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.action.ActionListener;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.ActionResponse;
 import org.lastaflute.web.response.HtmlResponse;
@@ -154,13 +154,13 @@ public class AdminMaintenanceAction extends FessAdminAction {
                 writeSystemProperties(zos, diagnosticId);
                 writeFessBasicConfig(zos, diagnosticId);
                 writeFessConfig(zos, diagnosticId);
-                writeElasticsearchCat(zos, diagnosticId);
-                writeElasticsearchJson(zos, diagnosticId);
+                writeFesenCat(zos, diagnosticId);
+                writeFesenJson(zos, diagnosticId);
             }
         });
     }
 
-    protected void writeElasticsearchJson(final ZipOutputStream zos, final String id) {
+    protected void writeFesenJson(final ZipOutputStream zos, final String id) {
         writeElastisearchJsonApi(zos, id, "cluster", "health");
         writeElastisearchJsonApi(zos, id, "cluster", "state");
         writeElastisearchJsonApi(zos, id, "cluster", "stats");
@@ -185,7 +185,7 @@ public class AdminMaintenanceAction extends FessAdminAction {
         }
     }
 
-    protected void writeElasticsearchCat(final ZipOutputStream zos, final String id) {
+    protected void writeFesenCat(final ZipOutputStream zos, final String id) {
         Arrays.stream(ES_CAT_NAMES).forEach(name -> {
             final ZipEntry entry = new ZipEntry(id + "/es_cat_" + name + ".txt");
             try {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
index 771aac068ad2ace3fe0c06aaa39b197775190d81..42b2f4e1da1e4e58d29936527caf041119ab55dc 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
@@ -27,6 +27,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.net.URLUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.CrudMode;
@@ -43,8 +45,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index f5cb7b2e938c0cece66b51d454f281e84a0ee535..0c2792418ada110646ca8c687a4edc4fe0099049 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.codelibs.fesen.client.IndicesAdminClient;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
@@ -32,7 +33,6 @@ import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
 import org.codelibs.fess.es.user.exbhv.RoleBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.UpgradeUtil;
-import org.elasticsearch.client.IndicesAdminClient;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
index 890e2b828a85e9c528a4073210ed7d3bc4ecb233..78fa84cefcd9e2579edbda509cef1ac5d97a92ea 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
@@ -25,6 +25,8 @@ import javax.annotation.Resource;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
@@ -41,8 +43,6 @@ import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.SearchHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
index 6a366cc9bdffceeff43adaf07056568b7322b21d..e7d4a75f461541b2d6a50f30160a79d27dfd0ed4 100644
--- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
+++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.FileUtil;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.elasticsearch.runner.net.EcrCurl;
+import org.codelibs.fesen.runner.net.EcrCurl;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
index cf369281a32ac3cc8b939bd2468be8c454402154..a5771bd5d5cf130dcddc33adf05d05304564669d 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
@@ -31,6 +31,7 @@ import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.SerializeUtil;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.builder.RequestDataBuilder;
 import org.codelibs.fess.crawler.client.CrawlerClient;
@@ -50,7 +51,6 @@ import org.codelibs.fess.exception.DataStoreCrawlingException;
 import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.lastaflute.di.core.SingletonLaContainer;
 
 public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
index 4f3ecd3f3255310f01b4f0fc06a8b4703a97ec81..f7d76809df5a1cc3a361bc6b86fc49efd927b878 100644
--- a/src/main/java/org/codelibs/fess/entity/FacetInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.stream.StreamUtil;
+import org.codelibs.fesen.search.aggregations.BucketOrder;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.search.aggregations.BucketOrder;
 
 public class FacetInfo {
     private static final Logger logger = LogManager.getLogger(FacetInfo.class);
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index 516d0f3b8ebd13af49a457442faabacae5091736..12da406c5946cbc9a53efd192bba2fd537a12377 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -25,12 +25,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.lastaflute.core.message.UserMessages;
 
 public class GeoInfo {
diff --git a/src/main/java/org/codelibs/fess/entity/PingResponse.java b/src/main/java/org/codelibs/fess/entity/PingResponse.java
index baf6418ff987bb77db52088bcb33e0bbbc0ca4fb..298ffffcbb41b832d6e2225f1e88df55607b41f8 100644
--- a/src/main/java/org/codelibs/fess/entity/PingResponse.java
+++ b/src/main/java/org/codelibs/fess/entity/PingResponse.java
@@ -22,11 +22,11 @@ import java.util.Locale;
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.action.admin.cluster.health.ClusterHealthResponse;
+import org.codelibs.fesen.cluster.health.ClusterHealthStatus;
+import org.codelibs.fesen.common.xcontent.XContentType;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.util.EsUtil;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.cluster.health.ClusterHealthStatus;
-import org.elasticsearch.common.xcontent.XContentType;
 
 public class PingResponse {
     private static final String CLUSTER_NAME = "cluster_name";
diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java
index 38c25cbbf3695677559269ceec1df701052ad560..f2a4488dd03e0281d42ef33d192e06f569ad3307 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -27,14 +27,14 @@ import java.util.Set;
 import java.util.function.Consumer;
 
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.search.sort.SortBuilder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
 import org.lastaflute.web.util.LaRequestUtil;
 
 public class QueryContext {
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index cafb680678b87818b5d0bb5fc21cb51f8799c9b1..d4e8ddb8fde35f250de9c831a7992363e5ac06a3 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -17,7 +17,7 @@ package org.codelibs.fess.es.client;
 
 import static org.codelibs.core.stream.StreamUtil.split;
 import static org.codelibs.core.stream.StreamUtil.stream;
-import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
+import static org.codelibs.fesen.runner.FesenRunner.newConfigs;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,9 +51,92 @@ import org.codelibs.core.io.ResourceUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.elasticsearch.client.HttpClient;
-import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner;
-import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.Configs;
+import org.codelibs.fesen.FesenException;
+import org.codelibs.fesen.action.ActionFuture;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.ActionRequest;
+import org.codelibs.fesen.action.ActionResponse;
+import org.codelibs.fesen.action.ActionType;
+import org.codelibs.fesen.action.DocWriteRequest;
+import org.codelibs.fesen.action.DocWriteRequest.OpType;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.cluster.health.ClusterHealthResponse;
+import org.codelibs.fesen.action.admin.indices.alias.IndicesAliasesRequestBuilder;
+import org.codelibs.fesen.action.admin.indices.create.CreateIndexResponse;
+import org.codelibs.fesen.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.codelibs.fesen.action.admin.indices.flush.FlushResponse;
+import org.codelibs.fesen.action.admin.indices.get.GetIndexResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse.Failure;
+import org.codelibs.fesen.action.bulk.BulkRequest;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequest;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.explain.ExplainRequest;
+import org.codelibs.fesen.action.explain.ExplainRequestBuilder;
+import org.codelibs.fesen.action.explain.ExplainResponse;
+import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesRequest;
+import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesRequestBuilder;
+import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesResponse;
+import org.codelibs.fesen.action.get.GetRequest;
+import org.codelibs.fesen.action.get.GetRequestBuilder;
+import org.codelibs.fesen.action.get.GetResponse;
+import org.codelibs.fesen.action.get.MultiGetRequest;
+import org.codelibs.fesen.action.get.MultiGetRequestBuilder;
+import org.codelibs.fesen.action.get.MultiGetResponse;
+import org.codelibs.fesen.action.index.IndexRequest;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.ClearScrollRequest;
+import org.codelibs.fesen.action.search.ClearScrollRequestBuilder;
+import org.codelibs.fesen.action.search.ClearScrollResponse;
+import org.codelibs.fesen.action.search.MultiSearchRequest;
+import org.codelibs.fesen.action.search.MultiSearchRequestBuilder;
+import org.codelibs.fesen.action.search.MultiSearchResponse;
+import org.codelibs.fesen.action.search.SearchPhaseExecutionException;
+import org.codelibs.fesen.action.search.SearchRequest;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.search.SearchScrollRequest;
+import org.codelibs.fesen.action.search.SearchScrollRequestBuilder;
+import org.codelibs.fesen.action.support.WriteRequest.RefreshPolicy;
+import org.codelibs.fesen.action.support.master.AcknowledgedResponse;
+import org.codelibs.fesen.action.termvectors.MultiTermVectorsRequest;
+import org.codelibs.fesen.action.termvectors.MultiTermVectorsRequestBuilder;
+import org.codelibs.fesen.action.termvectors.MultiTermVectorsResponse;
+import org.codelibs.fesen.action.termvectors.TermVectorsRequest;
+import org.codelibs.fesen.action.termvectors.TermVectorsRequestBuilder;
+import org.codelibs.fesen.action.termvectors.TermVectorsResponse;
+import org.codelibs.fesen.action.update.UpdateRequest;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.action.update.UpdateResponse;
+import org.codelibs.fesen.client.AdminClient;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.client.HttpClient;
+import org.codelibs.fesen.cluster.metadata.MappingMetadata;
+import org.codelibs.fesen.common.collect.ImmutableOpenMap;
+import org.codelibs.fesen.common.document.DocumentField;
+import org.codelibs.fesen.common.settings.Settings;
+import org.codelibs.fesen.common.settings.Settings.Builder;
+import org.codelibs.fesen.common.unit.TimeValue;
+import org.codelibs.fesen.common.xcontent.XContentType;
+import org.codelibs.fesen.index.query.InnerHitBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.runner.FesenRunner;
+import org.codelibs.fesen.runner.FesenRunner.Configs;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.collapse.CollapseBuilder;
+import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightBuilder;
+import org.codelibs.fesen.threadpool.ThreadPool;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FacetInfo;
 import org.codelibs.fess.entity.GeoInfo;
@@ -73,89 +156,6 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocMap;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.ActionFuture;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.action.ActionType;
-import org.elasticsearch.action.DocWriteRequest;
-import org.elasticsearch.action.DocWriteRequest.OpType;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.flush.FlushResponse;
-import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
-import org.elasticsearch.action.bulk.BulkRequest;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequest;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.explain.ExplainRequest;
-import org.elasticsearch.action.explain.ExplainRequestBuilder;
-import org.elasticsearch.action.explain.ExplainResponse;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
-import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.GetRequestBuilder;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.get.MultiGetRequest;
-import org.elasticsearch.action.get.MultiGetRequestBuilder;
-import org.elasticsearch.action.get.MultiGetResponse;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.ClearScrollRequest;
-import org.elasticsearch.action.search.ClearScrollRequestBuilder;
-import org.elasticsearch.action.search.ClearScrollResponse;
-import org.elasticsearch.action.search.MultiSearchRequest;
-import org.elasticsearch.action.search.MultiSearchRequestBuilder;
-import org.elasticsearch.action.search.MultiSearchResponse;
-import org.elasticsearch.action.search.SearchPhaseExecutionException;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchScrollRequest;
-import org.elasticsearch.action.search.SearchScrollRequestBuilder;
-import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
-import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
-import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
-import org.elasticsearch.action.termvectors.TermVectorsRequest;
-import org.elasticsearch.action.termvectors.TermVectorsRequestBuilder;
-import org.elasticsearch.action.termvectors.TermVectorsResponse;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.client.AdminClient;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.cluster.metadata.MappingMetadata;
-import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.document.DocumentField;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.settings.Settings.Builder;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.index.query.InnerHitBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.collapse.CollapseBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
-import org.elasticsearch.threadpool.ThreadPool;
 import org.lastaflute.core.message.UserMessages;
 import org.lastaflute.di.exception.ContainerInitFailureException;
 
@@ -173,7 +173,7 @@ public class FessEsClient implements Client {
 
     private static final String CONFIG_INDEX_PREFIX = ".fess_config";
 
-    protected ElasticsearchClusterRunner runner;
+    protected FesenRunner runner;
 
     protected Client client;
 
@@ -218,7 +218,7 @@ public class FessEsClient implements Client {
                 .name();
     }
 
-    public void setRunner(final ElasticsearchClusterRunner runner) {
+    public void setRunner(final FesenRunner runner) {
         this.runner = runner;
     }
 
@@ -244,7 +244,7 @@ public class FessEsClient implements Client {
         String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
         if (StringUtil.isBlank(httpAddress)) {
             if (runner == null) {
-                runner = new ElasticsearchClusterRunner();
+                runner = new FesenRunner();
                 final Configs config = newConfigs().clusterName(clusterName).numOfNode(1).useLogger();
                 final String esDir = System.getProperty("fess.es.dir");
                 if (esDir != null) {
@@ -266,7 +266,7 @@ public class FessEsClient implements Client {
             }
             final int port = runner.node().settings().getAsInt("http.port", 9200);
             httpAddress = "http://localhost:" + port;
-            logger.warn("Embedded Elasticsearch is running. This configuration is not recommended for production use.");
+            logger.warn("Embedded Fesen is running. This configuration is not recommended for production use.");
         }
         client = createHttpClient(fessConfig, httpAddress);
 
@@ -581,19 +581,19 @@ public class FessEsClient implements Client {
                 final ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute()
                         .actionGet(fessConfig.getIndexHealthTimeout());
                 if (logger.isDebugEnabled()) {
-                    logger.debug("Elasticsearch Cluster Status: {}", response.getStatus());
+                    logger.debug("Fesen Cluster Status: {}", response.getStatus());
                 }
                 return;
             } catch (final Exception e) {
                 cause = e;
             }
             if (logger.isDebugEnabled()) {
-                logger.debug("Failed to access to Elasticsearch:{}", i, cause);
+                logger.debug("Failed to access to Fesen:{}", i, cause);
             }
             ThreadUtil.sleep(1000L);
         }
-        final String message = "Elasticsearch (" + System.getProperty(Constants.FESS_ES_HTTP_ADDRESS)
-                + ") is not available. Check the state of your Elasticsearch cluster (" + clusterName + ") in "
+        final String message = "Fesen (" + System.getProperty(Constants.FESS_ES_HTTP_ADDRESS)
+                + ") is not available. Check the state of your Fesen cluster (" + clusterName + ") in "
                 + (System.currentTimeMillis() - startTime) + "ms.";
         throw new ContainerInitFailureException(message, cause);
     }
@@ -638,7 +638,7 @@ public class FessEsClient implements Client {
         }
         try {
             client.close();
-        } catch (final ElasticsearchException e) {
+        } catch (final FesenException e) {
             logger.warn("Failed to close Client: {}", client, e);
         }
     }
@@ -904,7 +904,7 @@ public class FessEsClient implements Client {
             final Result result = client.prepareUpdate().setIndex(index).setId(id).setDoc(field, value).execute()
                     .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
             return result == Result.CREATED || result == Result.UPDATED;
-        } catch (final ElasticsearchException e) {
+        } catch (final FesenException e) {
             throw new FessEsClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
         }
     }
@@ -949,7 +949,7 @@ public class FessEsClient implements Client {
             final ClusterHealthResponse response =
                     client.admin().cluster().prepareHealth().execute().actionGet(ComponentUtil.getFessConfig().getIndexHealthTimeout());
             return new PingResponse(response);
-        } catch (final ElasticsearchException e) {
+        } catch (final FesenException e) {
             throw new FessEsClientException("Failed to process a ping request.", e);
         }
     }
@@ -1265,7 +1265,7 @@ public class FessEsClient implements Client {
             }
             final Result result = response.getResult();
             return result == Result.CREATED || result == Result.UPDATED;
-        } catch (final ElasticsearchException e) {
+        } catch (final FesenException e) {
             throw new FessEsClientException("Failed to store: " + obj, e);
         }
     }
@@ -1285,7 +1285,7 @@ public class FessEsClient implements Client {
             }
             final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
             return response.getResult() == Result.DELETED;
-        } catch (final ElasticsearchException e) {
+        } catch (final FesenException e) {
             throw new FessEsClientException("Failed to delete: " + index + "/" + id + "@" + seqNo + ":" + primaryTerm, e);
         }
     }
@@ -1311,7 +1311,7 @@ public class FessEsClient implements Client {
     }
 
     //
-    // Elasticsearch Client
+    // Fesen Client
     //
 
     @Override
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
index 1abb14b4e63ebd961ed9a5c3631792b9ad9d8df9..ddfbe03bcafd8c143c5186f38fd50564906747c1 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
@@ -27,6 +27,23 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.index.seqno.SequenceNumbers;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.DocMeta;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
@@ -41,23 +58,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
 
 /**
  * @param <ENTITY> The type of entity.
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
-    //                                                                       Elasticsearch
+    //                                                                       Fesen
     //                                                                              ======
     public RefreshResponse refresh() {
         return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
index 52c72176c271eef712338b31096390e0cfc044d3..cb86f34b46668025d2209a1cf63c9bd86f06b0ef 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
index ab58022d638cb2030b5c6863323bb433faaf9755..e262709e1f6fd89f692bde79ca2435c419c5db3c 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
@@ -15,6 +15,8 @@
  */
 package org.codelibs.fess.es.config.allcommon;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.TimeValue;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -37,8 +39,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.TimeValue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index 9ccb959d86a2807d8fc214f90aecb6be15491e43..2e55c33c25d3e23842c7ab7f4fa1743fe152b9af 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -26,6 +26,32 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.search.sort.FieldSortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
 import org.dbflute.cbean.ckey.ConditionKey;
@@ -38,32 +64,6 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
index 4c5f078bca8b86387c4164ecbb7c978570bee95e..6a18ba96c41af98d0c148c3e086965727978490b 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.dbflute.Entity;
 import org.dbflute.FunCustodial;
 import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
 import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
 import org.dbflute.util.DfCollectionUtil;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
index 69b7a8b4edc3a0c0d26963a349a8561b9c84fa06..150eccd9b77965c06b6cfd97d8ea28d67e4070c7 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
 package org.codelibs.fess.es.config.allcommon;
 
 import org.apache.lucene.search.TotalHits;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.search.aggregations.Aggregations;
 import org.dbflute.cbean.result.PagingResultBean;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.search.aggregations.Aggregations;
 
 /**
  * @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
index 075c84d0b991ac2543b2d4d3c875efdd42ba558b..3fdb7662871e516a61fdafbac940e309ac32b3b8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
index 9b6fb59e8d3ab09e8c1c5c5c76f16db49e0a31d3..3d2f0414b1414182b55451a399cfa0009104b50b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
index 10f205a2a6d71f6c25a0acfa2a1dfa958943e8d8..a36f9389a141b0c59da385921c2322b9c24240ce 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
index 3d3e74529b7f026786d1082bdd57a2d894b55be4..73b5d0547396fa7a4704c725d755018212c03a31 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
index abc1bb5eed1d519f6be80c2027acc7953a87798c..031bde82e41a8fee74f077e873b1ef7174911f31 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
index ae022a510e4359f8ffe41bd98759fe1e378e2d43..79062d5de57e175054b5bd5252ea90696d4fb3a9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
index 398bdd03317893b824ab15998a7e8823341ce1f1..1510f413e9edcda837284cd567a7acc73f4b2bf4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
index 60c19e94d003644c64121a99ae499437a2484296..64268de2d0bf2512ebb54a3c12dc0b34fc534c36 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
index d8ae154427fdb3aa75aa0f79f6a7f21c994d78b0..af596f64532f43a88a2615aab8de3eb9dcae997f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
index f305288afe8a300b32572e3388950e1d4d8c7327..341b1cd62b1ac88702b89ba82843190b5730cb18 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
index c6036ad50d37510b6ba0fc8e1160df6c941d27fb..f054e105faa40b5152735e052f21fa937bd224dc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
index 4817426398119de655739a74a39b3d473643e5c2..b0059cea21ec32e2166c9b4e85a306c0cc8178f7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
index e55b76e50425026e856b5b1a4b598ba956b8fa83..519d982b49128a97b5d1bed1bd22e964daef50ad 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
index 4a5bcb6a43a38114d3abd6392c5b43fc8d1f9c1e..9708b722f633cab15a3fb552ce91b40ae9401511 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
index c47de45229845d9b954abcb6e6bb09234a816bf6..ddef8544575fe12070d36fa3c7d642a942e1220c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
index 56fe232dbfe492054bfd8ac84a770eeecf8c6855..9f7f7c6ea3026f60ea77400986f71ecf180b3bac 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
index abd9a2261234e729bf02d795e06c1e188621f38a..d9bc3321dcba69026311004597df01e4774b2aca 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
index 715f4bd563cd758713c774150b2c7688e9736094..45634ce3083109c48e0c7bc73a3f5a75b974efb3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
index 2a88d7834e2007a0416cbc1d9eb8b85b5f816a45..20b05b3f756354804c91f77ea29b2a0816313dd6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
index ec02e3b5eabdc0ea6dbe2186b5dac98100878794..c89d687bebae70960c38f028bb3df26e2d0d677c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
index 98d90c82f345b72a7b9c381b5c2bacc4b79af7e7..109fc5ed3843ef3033bd2b02be55b5294a0e030b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
index 20da14bac604e4f79a296d755df4b7730411fff3..5f13bd94eb71ebf6005c0689b10a39e92ec74c78 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
index 41fd6bdfe906957234c6242e3f4a4349915c5b34..e30c47480a962797b4e4825593a3b351c7bbac66 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
index dd3c1a6116bd94fa66023d427fc9f2007ef09281..edc8cfbafb6c1535592e35df44492899bb43e508 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
index e4e4d553f56097df16483fdcef37c1c2f87b0362..8303369555ca8e4daad0a67c8da233481b074861 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
 import org.codelibs.fess.es.config.cbean.AccessTokenCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsAccessTokenCA;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
index de29342e6d6bdb07b0e8a1dd305bb5b106d24d2d..afbe9d65a0812c4736aa321626f660e26e2b191a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
 import org.codelibs.fess.es.config.cbean.BadWordCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsBadWordCA;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
index dda3a63df1eefd324d5b64cb13d3a2971ae4f576..016144c4751ccd328be599e0b84fc43733492660 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
 import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsBoostDocumentRuleCA;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
index 9505c66fb46834f51cd405554e8a9437e4c10c2c..159bcf643e40043c16bfb44155d13e96da7e9b96 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
 import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
index 0db560ad8a11bec6f1460c87ad038612aa592382..aa0b1d9c92b910273b66a625daaa18427b7633e4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
 import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoParamCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
index 6091b52e87b72467018034d88215ce6c0f743a9d..94f75a461e3ee9b3215a64c33f0fd121ac9298d7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
 import org.codelibs.fess.es.config.cbean.DataConfigCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsDataConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
index c90b7428765c39e971ad1f1a043e28720f3a61c5..d773969cd1053a03a364e3596a36c349f2210380 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
 import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsDuplicateHostCA;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
index 9c5daacf193e9ace4a3f2da9ff4fa6cb9b4c35b4..a6f9bee86a71c602be5523603d6978c2f05423f0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
 import org.codelibs.fess.es.config.cbean.ElevateWordCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
index c3272a05d9ad1a3245a6a7311bb46529208144f8..4061d3f25d58ff87a9c1ebb35c8c85f8dc711856 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
 import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
index ea28143c77d19e8f8b493308b5eddf3bf2d0d5b2..46a3674a0193b1129469ae0a847496c050ed4f4e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
 import org.codelibs.fess.es.config.cbean.FailureUrlCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFailureUrlCA;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
index 1cfbfd552c700703f18d20c0e1db5c644e7e5af6..618487d1394c7f5b999dd9d5814b3c4efbc9a7bb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
 import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFileAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index 6ea7cd4697b0e946eece422ee03a954aff3b0b83..d7c21f47d572d31387fb654cd6942b07e528bac3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
 import org.codelibs.fess.es.config.cbean.FileConfigCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFileConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
index a21a83e3630464e7f9e53d9948478978cf9c4581..0a5752cdc380134dcce4fa1a77bf67ae4745e6b3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
 import org.codelibs.fess.es.config.cbean.JobLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsJobLogCA;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
index 5d2a258f9d690f99bc28493ee99e2f69e7f29f65..1734acf35b4a032944c25e662b9faf0846701711 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
 import org.codelibs.fess.es.config.cbean.KeyMatchCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsKeyMatchCA;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
index 10bf02c7cc6344c6d4bde4a71c52e2609b25a81d..ca9b531b4c2e9786331c2a90e1ab37b52360f585 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
 import org.codelibs.fess.es.config.cbean.LabelTypeCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsLabelTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
index b6b631fd0efb67caa00ce619d60647356e3510f1..e77545afec8c3455ea4445edb3e5d7a66f8c38ba 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
 import org.codelibs.fess.es.config.cbean.PathMappingCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsPathMappingCA;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
index fd98ea69d63ba56c18d98780aa9c894591885922..33531f3e531c8c1c6b336047171be6e675acc17a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
 import org.codelibs.fess.es.config.cbean.RelatedContentCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedContentCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
index b243f4a7ea4353fe5b88caed87920b37e83ac872..934c0243860be512806f8d596288d4f885429d43 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
 import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedQueryCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
index 611f839c36ba777fa957f37e3c6047c1bbecc9b0..37c864d71b703fbadb61707e173a9c7049e23d93 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
 import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRequestHeaderCA;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
index cf55c0b06199c9912fad17781a1a2e147f205c0a..1f9903b3a4a90f66900463f355606a2b852953ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
 import org.codelibs.fess.es.config.cbean.RoleTypeCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRoleTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
index 5bdc93f0a84370a1b52bef091c2feafcf8faf57c..5da5ff00dfeee2fe1a9fae9b22cb4be2b6044279 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
 import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsScheduledJobCA;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
index 496933e8196f091c8f02886b2102b2607e48ccb0..d6616d990fe370de51239df1069909704875ff5f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
 import org.codelibs.fess.es.config.cbean.ThumbnailQueueCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsThumbnailQueueCA;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
index a1e31f3e6fb6d7becb8752a016b0c8f87a9474db..a17be06d15e91260e6c6758d7397108afd6f74a8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
 import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsWebAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index f8f49fe7ce970fc62e188fd7ecbf05fc285a44f7..29da09766e83bc9dcde89089a08085d46b03cb14 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
 import org.codelibs.fess.es.config.cbean.WebConfigCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsWebConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
index 261a96bc7bf590b84f1fcd3960e0bc558be9e7ab..58a7d1f6e33dc286c5b395529b9093bc4d13e8d2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.AccessTokenCA;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
index 066f7cf80dca616f886ca4e0df426ae7f749afbc..978ac3703d25b2f2860156dec9b96d9786b23eb5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.BadWordCA;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index a843ddbc6e82dad16e9e66f71c822d9e2655d324..083d1e3f4352303d5226761642252e0385381540 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.BoostDocumentRuleCA;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
index 0765391ad6fd010f18c3dadc7331e618300e2a61..2dbacd4cf23c0a0f37c11f978f87fe8992ab97c4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index 84dbd8c54289855491668d334b2500d134459f49..da973c629b957b3ef22b66674a3e44b6c80b120d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoParamCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index b0ef16960e8ea4675e8776f75cb0c07ffb83bb67..1de4b40756b7f40442d37e9128222e3cee19a0d4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.DataConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
index 8da93deef0619c2be398034fe14ba8303085de1f..8d317141cf64acac89d303171b7f9dc107f7f7a3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.DuplicateHostCA;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
index 9ce996682ddf2fd83c7d532f3265dc36ed240b99..bf9a07130bcbb0b8fcb5e3cdc37fb274b2b265c3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ElevateWordCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index 42fce158ade2eb439ecad6e67c1cc45d289a0a09..1dbe34f5373970719d672a808b353d91101967f7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -15,22 +15,22 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ElevateWordToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
index 19a2d0c15586da53ba04de3cb560377ad498ae56..67bbca95bad4ac4c7b57251e08bff7a2b485d9e0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.FailureUrlCA;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
index 38fb05055a54adc9d938c9b904e0ba172c05ec74..20fcbf89a69fd8b5da9623343d820ac1f6fc7aba 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.FileAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index caa4eaa264f6417f00c6d8d4c593042ac517ff41..deae9c08bc978edf14b8a98b2caabf4cfe0ca0d9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.FileConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
index 15a8746207742a0b820978b92ab50e9cc393bc61..467d4dc1ec491234187ef70c14026d00ed4560f8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.JobLogCA;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
index 0e063422496445f95c29a6b439b018fe10c87896..b99463fb17fde03aa21439d40436dc8c5c5523fa 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.KeyMatchCA;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
index c91093678fb2e20ec8979ee30a4942fe301b7d3c..507d3b46ee2bc434f614e3b4fd1d1acf2b31caa2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.LabelTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
index 56c34f94cbf7ffcb7516f87b50f4e37851d9a48e..e5b5f722fbf61db8364564b52464632f712d90b3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.PathMappingCA;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
index 2aaffd26117d725b8bac436e10d54e0ad096153d..2795801ee97e858d80567fac5883e9c702819362 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RelatedContentCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
index 1cb457792b97cef8bce10d49746bd693ed2a2dd7..5875812324460e39dd1aa709b71039b347267d3e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RelatedQueryCA;
 import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
index 745da108e4dde862c981365bbee92b0db35d964b..7e49f549fab2b9c636ff004af4a0a3cabdddbe65 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RequestHeaderCA;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
index c5d388166ba1febdc527dcf17959b40828a3eef2..f555dd0b370139b617eb54c039eff68e9e292f6e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.RoleTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
index 73207f840be12a8da97b75c84391c722e2ffb5fa..f8d2b4949b406276a00f4162e7eca6daab02d773 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ScheduledJobCA;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
index e9311fa769d429f3f14baa41c1991a6cd0d211e7..6e38c77b8573ed6f6b2c5ecc7b414d276a945640 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.ThumbnailQueueCA;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 3b2d2caf9dcabaaef6e6a1168fd88831ac60fc47..b056e524b9cb322e7d90b187806a870ceb155261 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.WebAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index f20cc379a22c7764ddf4cae9f9286226d533876c..70fd150d0c4be6c2a20e9c31f9e670655fdec9ec 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.config.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.ca.WebConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
index aa6c65e414356ff172d9f001e3b9a47d01a5825e..d3c42b1c2cbc7f05e91d1d1a2e9c8e023f470bac 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
index 66a5f470e2e72d4f7b70d7ad2156ce4edf2c1eb6..220aeece3c1d84e21a58e85e1c682e0816ee56cb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index 73a4cb0a7488a8fc439a44b011c0d523e252609a..58b454984b5b00955f4422d3044cda4048939201 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
index fdfa385d2ad34ffefb6616ed5455ffcc6decbef5..3d4da65338ef1cd2c7fb679031e6bd12c39175dc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
index 0858ff414e07fa148e7ed92447f64817ac527cd4..36b209064a4b172a1cc5180f0d9c93912895fde6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
index 2f36677883c9ea9eafa17d41d5350562644e1dc9..b3746a185b29e21e38447395d5e2b0dac73b5dde 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
index 86ab58298abf595cb9d30a32e69d1e6138b124cd..75279d9a8e17cabb14c0aa6a20dd4e2ca0eecac8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
index 88fa6ce3e72cec9b7655e973a5d1f52297a6b535..08db3f2abe9daa12b246e25b785e28c92ecb8dd3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
index e5b40133326871963298c5dd83fd41cfaace6f98..f2dbf89b0e93b57794dcf145cd7359d85b3cc9d8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
index 4689188baad338dd450f19563403e3620378f6ed..776829549a9d9a004083b77bec6b0fa8cb0a62d9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index 4a963ddbf315ea1c20b32ef95ffbef413c013794..62d24e706106792b191cb967cc3f28b1541ee336 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
index b252cc5387a063a790c7b6631dea2b01eda2f6b1..147381698e22c597e0fa6b8eabb178636b107ca4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
index 8d4cd2f24869e0a892420be7e00f08445c70da54..cf40d52bae14c5727852a909d2e09532f6c6bf0b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
index e67c1b56300820ed31e1bdbe86cb4669809070d0..b0779006c0bbb559c87f100fe887356221ac3886 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
index f63b049ddf7a9c2c75329c55a927f9e672d92fcb..7061987c9c2799e1ac28f6e7688d7d394e9c2158 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
index 61e4a51d5fc325b87b47d27e72b3cc2acf0cb11a..737c7f658ff58d64cf48e33c7f6083d00a75fd2e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
index 41b484f4bf80086dae6aef780bef7b702f6b6882..f8c7481d3b0be9405f866ec4452fa57547bebb4a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
index 091002e4c004c42d51498d6dbb027b03b0f9b890..53e9e15411aaacc4abb6f982e4e365393ecf6a85 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
index 9d7ad8e83a84b2c313e2a0eefafe00b495dbf50d..96f9050412c1e916304be4a413a17dc622b3fb2d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
index acf2b7583e8e2f4aa38b725b94cde10b30a8b7f7..ddfd630f0aa5885215b08bfc2787231787f57d18 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
index 0166d8840381ee69ed2743789f7d863ebc6faaf3..0a9b748c07e2e4637fe42e73254009af830aec73 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
index e576d17efee18dfc3d04fa5acc795803201f0e57..e8dfb86bc0df00cbc5cb2fb61b8f0935c920e72d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index df249a62d89dc8b38db2fbffcedbbcd041867041..6801e74f1ab82c5e035cc9fe0cae1a9fe7e7633a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
index 767d662221f5e60c9c01fdd5c466050d90369eaf..001d6ff464aae7053e847cd1b0d123b22a6bd785 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
index 9db032a4615495e21e3cad90e11ab1c87896c344..b129743330a4c188fe49680a3c0c928cc5e1f909 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
@@ -27,6 +27,23 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.index.seqno.SequenceNumbers;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
@@ -41,23 +58,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
 
 /**
  * @param <ENTITY> The type of entity.
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
-    //                                                                       Elasticsearch
+    //                                                                       Fesen
     //                                                                              ======
     public RefreshResponse refresh() {
         return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
index 5789a8301dfd8d3738e56f05355d1768600d93b3..9308de039d5f575b0edb1a3d1c6319a628f9f6ea 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
index 78e2ceac7eaa9f59c1824882343fdbbb7175c382..629763e0cdbf152d3495988690e761c0de398333 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
@@ -15,6 +15,8 @@
  */
 package org.codelibs.fess.es.log.allcommon;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.TimeValue;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -37,8 +39,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.TimeValue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index 1a1e68818d99d3390a0f8d607b7ec07a351512ed..db7c31e716f5fc13db09f19fa6ab0e41c25a4707 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
@@ -26,6 +26,32 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.search.sort.FieldSortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
 import org.dbflute.cbean.ckey.ConditionKey;
@@ -38,32 +64,6 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
index 17dd2c907f91e20698e834ae4a93be6e6585f7ea..02ea9ca6f9ead3aaa8b1dc0e9e6e296343316f01 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.dbflute.Entity;
 import org.dbflute.FunCustodial;
 import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
 import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
 import org.dbflute.util.DfCollectionUtil;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
index c98c250dc9fec01563c88f8a0f39d419e76afde7..d63b8b5b17d37678424e67c1631a5848a51e3d31 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
 package org.codelibs.fess.es.log.allcommon;
 
 import org.apache.lucene.search.TotalHits;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.search.aggregations.Aggregations;
 import org.dbflute.cbean.result.PagingResultBean;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.search.aggregations.Aggregations;
 
 /**
  * @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
index c929765451ee7625ab4254654e59436627ffd74c..df31f34f2eee2840137fbd87f733d113185818ac 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
index 26b88446f9767207509ce205c067daf3868c09ee..9a20c5068dc91013e7cfd4e25aeb56b32afd0d01 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
index 512fcba13a78800639c41f645122978ec21f5654..c4b2d9c162bd10e683277b8e62bb16ffbdfa9826 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
index e13ed4133df3ef5fcc2a376c6e1c73360d5bff2d..7cdfdb964aa71efef104f47a9613433381361c77 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
@@ -31,9 +34,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
index 64e00a9146269ea1cc2f6d5da6aba76e3e3e1552..342fe9845a9d3934f2e31dd8f0ecad7b516ad5df 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
 import org.codelibs.fess.es.log.cbean.ClickLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsClickLogCA;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
index cd05226efd53e840fef9aa1c428bf3fc6de894a9..5cd97a39c970f9992ea559c12f3192ebc4ed0ed3 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
 import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsFavoriteLogCA;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
index 6f79391c540738ab9f65d85e2d32fd264de37189..160c04a41f3943d99ad66b483c7d8db4eeb291cb 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
 import org.codelibs.fess.es.log.cbean.SearchLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsSearchLogCA;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
index 98c6676eaf2fb7fe0c83d04c12c1f1ac15185e05..258a698ad7e7a4a7859cb2f77d3f665a0fde6447 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
 import org.codelibs.fess.es.log.cbean.UserInfoCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsUserInfoCA;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
index a84588a6fafabf1a69aa02da0ff8e312f89c0d2f..e5b108ac4362ef059fd7fcccaa857fa2030ec5c1 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
@@ -15,34 +15,34 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.ClickLogCA;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
index 433d3f48cc60154716bffeadf8a1762f017074f8..19a4ace5a39f92c1df322335985217ba3a1010cd 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -15,24 +15,24 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.FavoriteLogCA;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
index fbb7b6919aae9b431beb6d40c6738089dc248842..de49f4d98bcd7667dd4c56e544160fcdf7177014 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
@@ -15,34 +15,34 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.SearchLogCA;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
index 5805e59ad7bf75f5c90fc6cf22e3e5ffe251c7d6..144799629de30f9f0a18c5679c2199d9666afe72 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
@@ -15,21 +15,21 @@
  */
 package org.codelibs.fess.es.log.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.ca.UserInfoCA;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
index e9bab4868a92730c6fd0b88709249a642c423e13..46c956268f0991191624e6fa28df38fc3e725d26 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
index 120546b19be79f4180d6b591f2bd0d26bbd9e1dc..2dcc6e1fa6b81e80c90dedb74bb43f97364149e5 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
index eb16c4c47017ff778956471dbf3675859d08e410..6de0ddc8d932fab3bb2ed8a5290d55ec9744c518 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
index 08f0bf59dd617a3edaf3416b46ede6e8a2e62cf9..b42ac4ac1661f47a0dcaf40ddb71eeb01af43cf5 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -19,21 +19,21 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
index 3b3985262f8e51038ee553a9aed17f2535a3c6b5..36eb36c9a42983106b018b3e4ec2b1ae6803f9dd 100644
--- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
+++ b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
@@ -21,15 +21,15 @@ import java.util.Map;
 import java.util.Objects;
 
 import org.apache.lucene.search.Query;
-import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.io.stream.NamedWriteable;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ObjectParser;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.query.AbstractQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.codelibs.fesen.common.ParseField;
+import org.codelibs.fesen.common.io.stream.NamedWriteable;
+import org.codelibs.fesen.common.io.stream.StreamOutput;
+import org.codelibs.fesen.common.xcontent.ObjectParser;
+import org.codelibs.fesen.common.xcontent.XContentBuilder;
+import org.codelibs.fesen.common.xcontent.XContentParser;
+import org.codelibs.fesen.index.query.AbstractQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryShardContext;
 
 public class StoredLtrQueryBuilder extends AbstractQueryBuilder<StoredLtrQueryBuilder> implements NamedWriteable {
     public static final String NAME = "sltr";
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
index ac339a544d3e6e0711e192df4efce1ea16b842d7..fc047cecb492df1ca0224d99706ff0a02f916657 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
@@ -27,6 +27,23 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.index.seqno.SequenceNumbers;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
@@ -41,23 +58,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
 
 /**
  * @param <ENTITY> The type of entity.
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
-    //                                                                       Elasticsearch
+    //                                                                       Fesen
     //                                                                              ======
     public RefreshResponse refresh() {
         return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
index a12a000ce7a0ae743f1ec6e33408985dc357d71a..b46224fe14ba6845975423a93e2a1a6d7ce9433c 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
index 453c90b9ef9cdef12a98bc2f58d4d041a48e0bcf..4366944262158dcb3d1e582144892cfe1dc4bc14 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
@@ -15,6 +15,8 @@
  */
 package org.codelibs.fess.es.user.allcommon;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.TimeValue;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -37,8 +39,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.TimeValue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index b7f21a55b77cc601978c13e0c7b8d73d37e8843c..56740c7d6e353d5d2fe8c12cfc20ac00f2bd5848 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
@@ -26,6 +26,32 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.search.sort.FieldSortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
 import org.dbflute.cbean.ckey.ConditionKey;
@@ -38,32 +64,6 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
index 80923164a7d5f8f34670c18a8dd691fd4f08b706..0591592278526b93ebd865e257a9bcf6f1f264e5 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.dbflute.Entity;
 import org.dbflute.FunCustodial;
 import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
 import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
 import org.dbflute.util.DfCollectionUtil;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
index 1988400e20e9103ad98a263b830e0c000af7d43e..69d14908d80728e2614ab8a9261002f3d37eddaf 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
 package org.codelibs.fess.es.user.allcommon;
 
 import org.apache.lucene.search.TotalHits;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.search.aggregations.Aggregations;
 import org.dbflute.cbean.result.PagingResultBean;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.search.aggregations.Aggregations;
 
 /**
  * @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
index 3289efe848b2f13fd9158db77e34c99c1f2fd952..e945802a2b253d54dd9ec13e2c5c88426ca41fd1 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.user.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
index f511c254ea052dba4b7f09bd626b4bc361fa42ce..20b1833d2ab441b32d5841b6334f5065d23c3ba0 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.user.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
index 7a2f408de26af4a3c2a5ea76ec7184ff3e059246..0b8b24635aefb530003d7d657e9ab9a5bab12972 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.user.bsbhv;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
index 1b0c660996f73de4eaa1bd48cd3595dd02ac3919..fae2b02364eff1a5bf07349ead676457197de388 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
 import org.codelibs.fess.es.user.cbean.GroupCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsGroupCA;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
index 246f21c3003fd70cbbc69d9450325e8e100203c0..38dc8d188d0d108e9611c3ec572aa3ca02b9a843 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
 import org.codelibs.fess.es.user.cbean.RoleCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsRoleCA;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
index 35b6caca7e3dfce50849aaa59aaf31ce9ff039ef..c5337b97385600f33446d9139649c959fac44082 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
 import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
 import org.codelibs.fess.es.user.cbean.UserCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsUserCA;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
index 041d93c96b39aa5dff9cecea9f79e483ad0214d0..3e26a6a210ece047c53ab7f5d9816b0ae3d08688 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.user.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.ca.GroupCA;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
index c963f0bf9527a66185de97de0deafce617c7e311..712cb3c342d79c32a3979ff446e96067f1ac7479 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
@@ -15,22 +15,22 @@
  */
 package org.codelibs.fess.es.user.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.ca.RoleCA;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
index fb43a186541742cee4f7ff3e84c12d767dcf5a4d..a69f1d332c78769caffa6ab7f9bd539b1d5df815 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
@@ -15,32 +15,32 @@
  */
 package org.codelibs.fess.es.user.cbean.ca.bs;
 
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.ca.UserCA;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
index 2d04f00a236bfc94084b80b20f30234fc55f97b2..a09ba2e574f4e369856e1e4cd7fa696dfafadb66 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
index 82a08c5245e6633a2d05ff9ca0f20b09fd637828..d780feaf0548463980b34c0e8b8bca3911627ffa 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
index 8f0a411e7c365c49b02e6a192de1ddf074cdb536..64082f66248f11ae5d6d00d70261e5313837345a 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java
index 00c81e644190f98aa60179359e7ac810155ffba9..75caee062d8a9b04a3904becfe258a17fb208d96 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -44,10 +44,13 @@ import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
+import org.codelibs.fesen.monitor.jvm.JvmInfo;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingInfoService;
 import org.codelibs.fess.app.service.PathMappingService;
-import org.codelibs.fess.crawler.client.EsClient;
+import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
@@ -62,9 +65,6 @@ import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ThreadDumpUtil;
 import org.dbflute.mail.send.hook.SMailCallbackContext;
-import org.elasticsearch.monitor.jvm.JvmInfo;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.process.ProcessProbe;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
@@ -209,7 +209,7 @@ public class Crawler {
 
         final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
         if (StringUtil.isNotBlank(httpAddress)) {
-            System.setProperty(EsClient.HTTP_ADDRESS, httpAddress);
+            System.setProperty(FesenClient.HTTP_ADDRESS, httpAddress);
         }
 
         TimeoutTask systemMonitorTask = null;
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index bcedbddc0f854ff53f1cda3d06a5aa8c10e708f9..1248b0399c7f2154868627b3b3b90276367a7975 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -29,16 +29,16 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
+import org.codelibs.fesen.monitor.jvm.JvmInfo;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crawler.client.EsClient;
+import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.monitor.jvm.JvmInfo;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.process.ProcessProbe;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
@@ -105,7 +105,7 @@ public class SuggestCreator {
 
         final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
         if (StringUtil.isNotBlank(httpAddress)) {
-            System.setProperty(EsClient.HTTP_ADDRESS, httpAddress);
+            System.setProperty(FesenClient.HTTP_ADDRESS, httpAddress);
         }
 
         TimeoutTask systemMonitorTask = null;
diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
index 1779bc3733b1c9f8c661fa618eb1b52fb0c57342..8253197e79a69fbd9d9885d2d05e68ee63e6314d 100644
--- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
@@ -29,15 +29,15 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
+import org.codelibs.fesen.monitor.jvm.JvmInfo;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crawler.client.EsClient;
+import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.monitor.jvm.JvmInfo;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.process.ProcessProbe;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
@@ -113,7 +113,7 @@ public class ThumbnailGenerator {
 
         final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
         if (StringUtil.isNotBlank(httpAddress)) {
-            System.setProperty(EsClient.HTTP_ADDRESS, httpAddress);
+            System.setProperty(FesenClient.HTTP_ADDRESS, httpAddress);
         }
 
         TimeoutTask systemMonitorTask = null;
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index bc1b80a8eac53e575941acb5d73d21384cb570bb..397cdb0ce6fce2ffd6c486c08922b16f629fe347 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -31,6 +31,12 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.security.MessageDigestUtil;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.BucketOrder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms.Bucket;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingInfoService;
 import org.codelibs.fess.es.client.FessEsClient;
@@ -40,12 +46,6 @@ import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.BucketOrder;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 
 public class CrawlingInfoHelper {
     private static final Logger logger = LogManager.getLogger(CrawlingInfoHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/CurlHelper.java b/src/main/java/org/codelibs/fess/helper/CurlHelper.java
index 4933028e8539799ef2144d9311126536a38debd3..c1e0b56ea72d4a364c4d7754fc6e1c647fbeca99 100644
--- a/src/main/java/org/codelibs/fess/helper/CurlHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CurlHelper.java
@@ -38,6 +38,6 @@ public class CurlHelper {
     }
 
     public CurlRequest request(final Method method, final String path) {
-        return new CurlRequest(method, ResourceUtil.getElasticsearchHttpUrl() + path);
+        return new CurlRequest(method, ResourceUtil.getFesenHttpUrl() + path);
     }
 }
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index b30ff1767809bc95e90e51bd6b557ce5cbf849fe..57e42f6b408dc55296a5926887cad150ed16d703 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -25,6 +25,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.FailureUrlService;
 import org.codelibs.fess.ds.DataStore;
@@ -34,8 +36,6 @@ import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 
 public class DataIndexHelper {
 
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 813ebaa0af604131c2a1583071d7812671c6a2d6..feb5f55a7c571219789ae1dad6d16150bf647587 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -21,15 +21,15 @@ import java.util.Map;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.MemoryUtil;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 
 public class IndexingHelper {
     private static final Logger logger = LogManager.getLogger(IndexingHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index 1f80ceb4261fc425e36dae061acfe4e6165d0848..c8cf23e7fc2c5764ea5d5ccc5b2b491df17ed7a5 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -29,6 +29,12 @@ import org.codelibs.core.concurrent.CommonPoolUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
 import org.codelibs.fess.es.client.FessEsClient;
@@ -38,12 +44,6 @@ import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
 
 public class KeyMatchHelper {
     private static final Logger logger = LogManager.getLogger(KeyMatchHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
index ee4dc6247554e50e9c11858331b19a551f6c4956..49d4444c3cd127e6afa4ca19cc8f275eeab83f8f 100644
--- a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
@@ -26,10 +26,10 @@ import org.apache.logging.log4j.Logger;
 import org.apache.tika.language.detect.LanguageDetector;
 import org.apache.tika.language.detect.LanguageResult;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
-import org.elasticsearch.script.Script;
 
 public class LanguageHelper {
     private static final Logger logger = LogManager.getLogger(LanguageHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
index 8c2a5629268231899c574e4c2ed23715b529f3df..b6fe561ea8c4111727786f9cd0f5066fe2d9ceac 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -53,6 +53,19 @@ import org.apache.lucene.search.WildcardQuery;
 import org.apache.lucene.util.BytesRef;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
+import org.codelibs.fesen.search.rescore.RescorerBuilder;
+import org.codelibs.fesen.search.sort.SortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FacetInfo;
 import org.codelibs.fess.entity.GeoInfo;
@@ -64,19 +77,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.score.QueryRescorer;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
-import org.elasticsearch.search.rescore.RescorerBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 import org.lastaflute.core.message.UserMessages;
 import org.lastaflute.web.util.LaRequestUtil;
 
diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
index 782706d63e95ca43cd029a7cde50e4e91386684a..2e7bc1096b9372e009d7ccb60568d15f6b657123 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
@@ -33,6 +33,15 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.FesenException;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.action.update.UpdateResponse;
+import org.codelibs.fesen.common.document.DocumentField;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.QueryContext;
 import org.codelibs.fess.entity.SearchRenderData;
@@ -48,15 +57,6 @@ import org.codelibs.fess.util.QueryResponseList;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.common.document.DocumentField;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.lastaflute.taglib.function.LaFunctions;
 import org.lastaflute.web.util.LaRequestUtil;
 
@@ -330,7 +330,7 @@ public class SearchHelper {
             builderLambda.accept(builder);
             final UpdateResponse response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
             return response.getResult() == Result.CREATED || response.getResult() == Result.UPDATED;
-        } catch (final ElasticsearchException e) {
+        } catch (final FesenException e) {
             throw new FessEsClientException("Failed to update doc  " + id, e);
         }
     }
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index d51a6c46e5d0fbc9a11aba1f5d9e0612fd82dc54..b60c66a4b22527c30f3d3d628f89c0a29b0a4fed 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -37,6 +37,8 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.concurrent.CommonPoolUtil;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.action.update.UpdateRequest;
+import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchLogEvent;
 import org.codelibs.fess.entity.SearchRequestParams;
@@ -55,8 +57,6 @@ import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.QueryResponseList;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.script.Script;
 import org.lastaflute.web.util.LaRequestUtil;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index 86fbd3404448e1a55b5c17c04153aa3990ac3549..d14304579b003a8ade99090205153de5fc1f09a5 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -37,6 +37,12 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.common.lucene.search.function.CombineFunction;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
+import org.codelibs.fesen.search.sort.SortBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.es.config.exbhv.BadWordBhv;
@@ -56,12 +62,6 @@ import org.codelibs.fess.suggest.settings.SuggestSettings;
 import org.codelibs.fess.suggest.settings.SuggestSettingsBuilder;
 import org.codelibs.fess.suggest.util.SuggestUtil;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.common.lucene.search.function.CombineFunction;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
-import org.elasticsearch.search.sort.SortBuilders;
 
 public class SuggestHelper {
     private static final Logger logger = LogManager.getLogger(SuggestHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index 1da1acf8a467b70593d60981d89cde3433d3ece7..8ceac2d2e83c3f0a2c6f919a7f2a5ab2a3a8e891 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -59,6 +59,7 @@ import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.monitor.os.OsProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.util.CharUtil;
 import org.codelibs.fess.exception.FessSystemException;
@@ -70,7 +71,6 @@ import org.codelibs.fess.util.GsaConfigParser;
 import org.codelibs.fess.util.ParameterUtil;
 import org.codelibs.fess.util.ResourceUtil;
 import org.codelibs.fess.validation.FessActionValidator;
-import org.elasticsearch.monitor.os.OsProbe;
 import org.lastaflute.core.message.supplier.UserMessagesCreator;
 import org.lastaflute.web.TypicalAction;
 import org.lastaflute.web.response.HtmlResponse;
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index 047c4e05b9b8ec9758e92aec44574dea8c5b977f..d443d86d0b2a103364d6c8c129272a387068759e 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -28,6 +28,10 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.Crawler;
 import org.codelibs.fess.crawler.entity.AccessResult;
@@ -56,10 +60,6 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.MemoryUtil;
 import org.codelibs.fess.util.ThreadDumpUtil;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 
 public class IndexUpdater extends Thread {
     private static final Logger logger = LogManager.getLogger(IndexUpdater.class);
diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java
index 9d6c06a83ce7a97a4eee5ee9b263f6c0db537fee..63b4fc56fe5e4387703a51c9f5f67e61b800858a 100644
--- a/src/main/java/org/codelibs/fess/job/CrawlJob.java
+++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java
@@ -244,7 +244,7 @@ public class CrawlJob extends ExecJob {
         }
         cmdList.add(buf.toString());
 
-        if (useLocalElasticsearch) {
+        if (useLocalFesen) {
             final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
             if (StringUtil.isNotBlank(httpAddress)) {
                 cmdList.add("-D" + Constants.FESS_ES_HTTP_ADDRESS + "=" + httpAddress);
diff --git a/src/main/java/org/codelibs/fess/job/ExecJob.java b/src/main/java/org/codelibs/fess/job/ExecJob.java
index 1c56b8471760f312a37f5f73edfda220072e6686..5dee8c1af9166b8bef3b7b5904bde347e0606c16 100644
--- a/src/main/java/org/codelibs/fess/job/ExecJob.java
+++ b/src/main/java/org/codelibs/fess/job/ExecJob.java
@@ -42,7 +42,7 @@ public abstract class ExecJob {
 
     protected String sessionId;
 
-    protected boolean useLocalElasticsearch = true;
+    protected boolean useLocalFesen = true;
 
     protected String logFilePath;
 
@@ -90,8 +90,8 @@ public abstract class ExecJob {
         return this;
     }
 
-    public ExecJob useLocalElasticsearch(final boolean useLocalElasticsearch) {
-        this.useLocalElasticsearch = useLocalElasticsearch;
+    public ExecJob useLocalFesen(final boolean useLocalFesen) {
+        this.useLocalFesen = useLocalFesen;
         return this;
     }
 
diff --git a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
index 24c301faf071b61ffa687e9c5396960e9b345a3f..5fbaf2edcaa8adb47ba6000b88d4d6fa2ae04dc0 100644
--- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
+++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
@@ -141,7 +141,7 @@ public class GenerateThumbnailJob extends ExecJob {
         }
         cmdList.add(buf.toString());
 
-        if (useLocalElasticsearch) {
+        if (useLocalFesen) {
             final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
             if (StringUtil.isNotBlank(httpAddress)) {
                 cmdList.add("-D" + Constants.FESS_ES_HTTP_ADDRESS + "=" + httpAddress);
diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index 751cbe0ea2c5ef7dd28f51c3e1d7d9eff8ec05b6..b61c0342f06b648dc3ef06647ac44cceb41bcf34 100644
--- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
+++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
@@ -17,11 +17,11 @@ package org.codelibs.fess.job;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 
 public class PurgeDocJob {
 
diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java
index df50d248010f442b39eeeaa8141c9ee60fab20d1..0d148e90ecdde4cd25feaf7cd453d01dcd9dd041 100644
--- a/src/main/java/org/codelibs/fess/job/SuggestJob.java
+++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java
@@ -128,7 +128,7 @@ public class SuggestJob extends ExecJob {
         }
         cmdList.add(buf.toString());
 
-        if (useLocalElasticsearch) {
+        if (useLocalFesen) {
             final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
             if (StringUtil.isNotBlank(httpAddress)) {
                 cmdList.add("-D" + Constants.FESS_ES_HTTP_ADDRESS + "=" + httpAddress);
diff --git a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
index 6c2d5bafa27b836f7785c4ce57b18d950986be26..354aa2bb76b9b479b49011da7a3c8959297c7ae8 100644
--- a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
+++ b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
@@ -22,14 +22,14 @@ import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.script.Script;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.helper.LanguageHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.script.Script;
 
 public class UpdateLabelJob {
 
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index b0641ddea2d80dad3190e4cf949a4142d6b92423..42225610281204c0adff9d6449695c64c6a2b8e5 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -1679,10 +1679,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /**
      * Get the value for the key 'elasticsearch.http.url'. <br>
      * The value is, e.g. http://localhost:9201 <br>
-     * comment: Elasticsearch
+     * comment: Fesen
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
-    String getElasticsearchHttpUrl();
+    String getFesenHttpUrl();
 
     /**
      * Get the value for the key 'app.cipher.algorism'. <br>
@@ -6878,7 +6878,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             return get(FessConfig.DOMAIN_TITLE);
         }
 
-        public String getElasticsearchHttpUrl() {
+        public String getFesenHttpUrl() {
             return get(FessConfig.ELASTICSEARCH_HTTP_URL);
         }
 
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
index a4d256ec8a8eaeaaca483aa3187c7bc9133f8038..ee70cfcc2344154508cd1737f749b1ae5ccfb9a9 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -49,6 +49,9 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
 import org.codelibs.core.misc.Tuple3;
 import org.codelibs.core.misc.Tuple4;
+import org.codelibs.fesen.search.sort.SortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
@@ -59,9 +62,6 @@ import org.codelibs.fess.util.JvmUtil;
 import org.codelibs.fess.util.PrunedTag;
 import org.dbflute.optional.OptionalThing;
 import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
 import org.lastaflute.job.LaJob;
 import org.lastaflute.job.subsidiary.JobConcurrentExec;
 import org.lastaflute.web.validation.RequiredValidator;
diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
index 1b75c1fae94b40470f9dd0cb61a78b20a65c1b10..8a29d9cc32fa02fd792ef80767b3fdb52c0346fb 100644
--- a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
@@ -18,11 +18,11 @@ package org.codelibs.fess.score;
 import java.util.Map;
 
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.search.rescore.QueryRescorerBuilder;
+import org.codelibs.fesen.search.rescore.RescorerBuilder;
 import org.codelibs.fess.es.query.StoredLtrQueryBuilder;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.search.rescore.QueryRescorerBuilder;
-import org.elasticsearch.search.rescore.RescorerBuilder;
 
 public class LtrQueryRescorer implements QueryRescorer {
 
diff --git a/src/main/java/org/codelibs/fess/score/QueryRescorer.java b/src/main/java/org/codelibs/fess/score/QueryRescorer.java
index b5cd28fba6542a1b052751d37c05b3b8317c33d6..24e3c149f817682bf5a3732df7aa0f756c11382c 100644
--- a/src/main/java/org/codelibs/fess/score/QueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/QueryRescorer.java
@@ -17,7 +17,7 @@ package org.codelibs.fess.score;
 
 import java.util.Map;
 
-import org.elasticsearch.search.rescore.RescorerBuilder;
+import org.codelibs.fesen.search.rescore.RescorerBuilder;
 
 public interface QueryRescorer {
     RescorerBuilder<?> evaluate(final Map<String, Object> params);
diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
index cf1577f549345cea071e4c7ddadf05c1560c617d..d57bc5be3c75d0bc783abcd8acab449eb052574a 100644
--- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java
+++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
@@ -22,17 +22,17 @@ import java.util.function.Function;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.script.Script;
+import org.codelibs.fesen.script.ScriptType;
+import org.codelibs.fesen.search.SearchHit;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.script.Script;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.search.SearchHit;
 
 public abstract class ScoreBooster {
     private static final Logger logger = LogManager.getLogger(ScoreBooster.class);
diff --git a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
index 8bff5114a745b4a107ba67850dd778c4c7d466d6..5d6af1c4088e02bc7e63b85337e42ff19b3d7176 100644
--- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
+++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
@@ -47,7 +47,7 @@ import org.codelibs.core.net.UuidUtil;
 import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.curl.Curl;
 import org.codelibs.curl.CurlResponse;
-import org.codelibs.elasticsearch.runner.net.EcrCurl;
+import org.codelibs.fesen.runner.net.EcrCurl;
 import org.codelibs.fess.app.web.base.login.ActionResponseCredential;
 import org.codelibs.fess.app.web.base.login.AzureAdCredential;
 import org.codelibs.fess.app.web.base.login.AzureAdCredential.AzureAdUser;
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index e3dde7513743a575b0521e3df6c481c74eb2eee8..8be7266b44114f28ac4c4fefa1de856c82e0f733 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -51,13 +51,13 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.pdfbox.util.DateConverter;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.common.joda.Joda;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
 import org.codelibs.fess.entity.FacetQueryView;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.common.joda.Joda;
 import org.lastaflute.di.util.LdiURLUtil;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index 1143e46acaec1fb83da02502635df793055c41c5..22b0d42b3bfc04f4935debc8995f24d66f0f49a5 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -41,6 +41,7 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Tuple3;
+import org.codelibs.fesen.index.query.QueryBuilders;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv;
@@ -52,7 +53,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.ResourceUtil;
-import org.elasticsearch.index.query.QueryBuilders;
 
 import com.google.common.collect.Lists;
 
diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
index 4a6366efac5d5eded4e64ec5b46448435d80789d..96f9dcf192ed8a9df142ce902298ed281007f6df 100644
--- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
+++ b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
@@ -26,22 +26,22 @@ import org.apache.commons.text.StringEscapeUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.timer.TimeoutTarget;
+import org.codelibs.fesen.action.admin.cluster.node.stats.NodesStatsResponse;
+import org.codelibs.fesen.common.xcontent.ToXContent;
+import org.codelibs.fesen.common.xcontent.XContentBuilder;
+import org.codelibs.fesen.common.xcontent.XContentFactory;
+import org.codelibs.fesen.monitor.jvm.JvmStats;
+import org.codelibs.fesen.monitor.jvm.JvmStats.BufferPool;
+import org.codelibs.fesen.monitor.jvm.JvmStats.Classes;
+import org.codelibs.fesen.monitor.jvm.JvmStats.GarbageCollectors;
+import org.codelibs.fesen.monitor.jvm.JvmStats.Mem;
+import org.codelibs.fesen.monitor.jvm.JvmStats.Threads;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.os.OsStats;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.monitor.jvm.JvmStats;
-import org.elasticsearch.monitor.jvm.JvmStats.BufferPool;
-import org.elasticsearch.monitor.jvm.JvmStats.Classes;
-import org.elasticsearch.monitor.jvm.JvmStats.GarbageCollectors;
-import org.elasticsearch.monitor.jvm.JvmStats.Mem;
-import org.elasticsearch.monitor.jvm.JvmStats.Threads;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.os.OsStats;
-import org.elasticsearch.monitor.process.ProcessProbe;
 
 public class SystemMonitorTarget implements TimeoutTarget {
     private static final Logger logger = LogManager.getLogger(SystemMonitorTarget.class);
@@ -77,7 +77,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
         appendOsStats(buf);
         appendProcessStats(buf);
         appendJvmStats(buf);
-        appendElasticsearchStats(buf);
+        appendFesenStats(buf);
 
         append(buf, "timestamp", System::currentTimeMillis);
         buf.append('}');
@@ -175,7 +175,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
         buf.append("},");
     }
 
-    private void appendElasticsearchStats(final StringBuilder buf) {
+    private void appendFesenStats(final StringBuilder buf) {
         String stats = null;
         try {
             final FessEsClient esClient = ComponentUtil.getFessEsClient();
@@ -189,7 +189,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
                 stats = ((ByteArrayOutputStream) out).toString(Constants.UTF_8);
             }
         } catch (final Exception e) {
-            logger.debug("Failed to access Elasticsearch stats.", e);
+            logger.debug("Failed to access Fesen stats.", e);
         }
         buf.append("\"elasticsearch\":").append(stats).append(',');
     }
diff --git a/src/main/java/org/codelibs/fess/util/EsUtil.java b/src/main/java/org/codelibs/fess/util/EsUtil.java
index 3acd5470b5737f7c5ff619b4bf5714cc983081cb..caec98c46b958d1bbaf6dbae35f190ec10d367ab 100644
--- a/src/main/java/org/codelibs/fess/util/EsUtil.java
+++ b/src/main/java/org/codelibs/fess/util/EsUtil.java
@@ -21,10 +21,10 @@ import java.io.OutputStream;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.codelibs.fesen.common.xcontent.ToXContent;
+import org.codelibs.fesen.common.xcontent.XContentBuilder;
+import org.codelibs.fesen.common.xcontent.XContentFactory;
+import org.codelibs.fesen.common.xcontent.XContentType;
 
 public final class EsUtil {
 
diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java
index b091310b1be872761292e2988d50d5ebc4782215..3c43c8f374288aa60d5e7af545c361baca3ee1e7 100644
--- a/src/main/java/org/codelibs/fess/util/FacetResponse.java
+++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java
@@ -21,10 +21,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.codelibs.fesen.search.aggregations.Aggregations;
+import org.codelibs.fesen.search.aggregations.bucket.filter.Filter;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
 import org.codelibs.fess.Constants;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.filter.Filter;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 
 import com.google.common.io.BaseEncoding;
 
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index 48e3794c10874ad8af7adb1e95f47a0b9e990b42..eb1ee9c6e3478e8e6308a564db7035037499bfe3 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -28,18 +28,18 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.stream.StreamUtil;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.common.document.DocumentField;
+import org.codelibs.fesen.common.text.Text;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
+import org.codelibs.fesen.search.aggregations.Aggregations;
+import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightField;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.helper.QueryHelper;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.common.document.DocumentField;
-import org.elasticsearch.common.text.Text;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
 
 public class QueryResponseList implements List<Map<String, Object>> {
 
diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
index ba65693f14d1f0c9b84f1db68bf1dd6616aa958e..6c92393d0362966af384ad3e9e35bc15bb6c80ef 100644
--- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
@@ -42,13 +42,13 @@ public class ResourceUtil {
         // nothing
     }
 
-    public static String getElasticsearchHttpUrl() {
+    public static String getFesenHttpUrl() {
         final String url = System.getProperty("fess.es.http_address");
         if (url != null) {
             return url;
         }
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessConfig.getElasticsearchHttpUrl();
+        return fessConfig.getFesenHttpUrl();
     }
 
     public static String getAppType() {
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index 2e1bc0bd27004be4c0870e6d3f841e50cf79019a..3cd33819f3df57fffe69d042540f03ebc12d76ae 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -23,20 +23,20 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.exception.ResourceNotFoundRuntimeException;
 import org.codelibs.core.io.FileUtil;
 import org.codelibs.curl.CurlResponse;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetFieldMappingsResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.put.PutMappingRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequest;
+import org.codelibs.fesen.action.support.master.AcknowledgedResponse;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.client.IndicesAdminClient;
+import org.codelibs.fesen.cluster.metadata.MappingMetadata;
+import org.codelibs.fesen.common.collect.ImmutableOpenMap;
+import org.codelibs.fesen.common.xcontent.XContentType;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
-import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.IndicesAdminClient;
-import org.elasticsearch.cluster.metadata.MappingMetadata;
-import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.xcontent.XContentType;
 
 public final class UpgradeUtil {
     private static final Logger logger = LogManager.getLogger(UpgradeUtil.class);
diff --git a/src/main/resources/crawler/es.xml b/src/main/resources/crawler/es.xml
index 1bc8475aaf9a9259ec38cbcc7d06b237b597f0a5..ad2cfd0d746cae4c5252ed018528d7f47a042745 100644
--- a/src/main/resources/crawler/es.xml
+++ b/src/main/resources/crawler/es.xml
@@ -3,6 +3,6 @@
 	"http://dbflute.org/meta/lastadi10.dtd">
 <components>
 	<component name="esClient"
-		class="org.codelibs.fess.crawler.client.EsClient">
+		class="org.codelibs.fess.crawler.client.FesenClient">
 	</component>
 </components>
diff --git a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
index 4b012f3798d8ede4897ecb3fa6cb9bc33bc3df60..91a0c8ff05667c494ddb507f5b27b6d6f68d3995 100644
--- a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
+++ b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
@@ -15,7 +15,7 @@
 {"index":{"_index":".fess_config.scheduled_job","_id":"reload_config"}}
 {"name":"Config Reloader","target":"all","cronExpression":"*/10 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"systemHelper\").updateConfiguration();","jobLogging":false,"crawler":false,"available":true,"sortOrder":8,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
 {"index":{"_index":".fess_config.scheduled_job","_id":"ping_es"}}
-{"name":"Ping Elasticsearch","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingEsJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
+{"name":"Ping Search Engine","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingEsJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
 {"index":{"_index":".fess_config.scheduled_job","_id":"score_booster"}}
 {"name":"Score Updater","target":"all","cronExpression":"0 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"scoreUpdater\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":10,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
 {"index":{"_index":".fess_config.scheduled_job","_id":"label_updater"}}
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index 40510e102ef26d85ada32db79a0e2418676e13f7..4f48ba1bf2b617f81fb7d217befd9d31add2e4be 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -26,12 +26,12 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
 
 public class QueryHelperTest extends UnitFessTestCase {