diff --git a/dbflute_fess/dfprop/esfluteMap.dfprop b/dbflute_fess/dfprop/esfluteMap.dfprop
index 73bbc123a..d4bb0e8e2 100644
--- a/dbflute_fess/dfprop/esfluteMap.dfprop
+++ b/dbflute_fess/dfprop/esfluteMap.dfprop
@@ -1,6 +1,6 @@
 map:{
     # base package of generated classes
-    ; basePackage = org.codelibs.fess.es
+    ; basePackage = org.codelibs.fess.opensearch
 
     # base path to JSON resource, URL or relative path
     ; basePath = ../src/main/config/es
diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
index 23696b105..5d23edde8 100644
--- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
@@ -50,7 +50,6 @@
 import org.codelibs.fess.entity.SearchRenderData;
 import org.codelibs.fess.entity.SearchRequestParams;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidAccessTokenException;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
@@ -65,6 +64,7 @@
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.helper.UserInfoHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.suggest.entity.SuggestItem;
 import org.codelibs.fess.suggest.request.suggest.SuggestRequestBuilder;
 import org.codelibs.fess.suggest.request.suggest.SuggestResponse;
diff --git a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
index f48195c66..7bb97d7af 100644
--- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
+++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
@@ -22,10 +22,10 @@
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.logic.AccessContextLogic;
 import org.codelibs.fess.app.service.ScheduledJobService;
-import org.codelibs.fess.es.config.exbhv.JobLogBhv;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.core.time.TimeManager;
diff --git a/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java b/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
index 146be39df..d3a18198a 100644
--- a/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
+++ b/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
@@ -19,12 +19,12 @@
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exentity.JobLog;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.exception.ScheduledJobException;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.JobExecutor;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.JobManager;
 import org.lastaflute.job.LaJob;
diff --git a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
index 3a19fdfcf..dd0c42b34 100644
--- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
+++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
@@ -25,11 +25,11 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.AccessTokenPager;
-import org.codelibs.fess.es.config.cbean.AccessTokenCB;
-import org.codelibs.fess.es.config.exbhv.AccessTokenBhv;
-import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.exception.InvalidAccessTokenException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.AccessTokenCB;
+import org.codelibs.fess.opensearch.config.exbhv.AccessTokenBhv;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/service/BadWordService.java b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
index ff4a60b74..5a0bd8a04 100644
--- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
@@ -27,11 +27,11 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.BadWordPager;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.cbean.BadWordCB;
-import org.codelibs.fess.es.config.exbhv.BadWordBhv;
-import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.cbean.BadWordCB;
+import org.codelibs.fess.opensearch.config.exbhv.BadWordBhv;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
index f12caeb01..92b849508 100644
--- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
@@ -21,10 +21,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.BoostDocPager;
-import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
-import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB;
+import org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
index 2f3c861c6..3088ba814 100644
--- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
@@ -35,13 +35,13 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.CrawlingInfoPager;
-import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
-import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv;
-import org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv;
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
-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.opensearch.config.cbean.CrawlingInfoCB;
+import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv;
+import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoParamBhv;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.ListResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
index 9d449ad1a..18a41c609 100644
--- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
@@ -21,10 +21,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.DataConfigPager;
-import org.codelibs.fess.es.config.cbean.DataConfigCB;
-import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
index 3507496bf..44432bacb 100644
--- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
@@ -21,10 +21,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.DuplicateHostPager;
-import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
-import org.codelibs.fess.es.config.exbhv.DuplicateHostBhv;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.opensearch.config.exbhv.DuplicateHostBhv;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
index 5715e14f0..3049cad14 100644
--- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
@@ -31,16 +31,16 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ElevateWordPager;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.cbean.ElevateWordCB;
-import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
-import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
-import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.cbean.ElevateWordCB;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
index 45ff6d790..afa4a6655 100644
--- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
@@ -26,13 +26,13 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FailureUrlPager;
-import org.codelibs.fess.es.config.cbean.FailureUrlCB;
-import org.codelibs.fess.es.config.exbhv.FailureUrlBhv;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
+import org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
index 82772f688..19a7faf40 100644
--- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
@@ -20,12 +20,12 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
index 7fcae7db2..327aac107 100644
--- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
@@ -20,10 +20,10 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileAuthPager;
-import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
-import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB;
+import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
index 5817ef62e..b9f40efa3 100644
--- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
@@ -21,11 +21,11 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileConfigPager;
-import org.codelibs.fess.es.config.cbean.FileConfigCB;
-import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/service/GroupService.java b/src/main/java/org/codelibs/fess/app/service/GroupService.java
index 94a3225fd..fb2fe0a96 100644
--- a/src/main/java/org/codelibs/fess/app/service/GroupService.java
+++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java
@@ -22,11 +22,11 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.GroupPager;
-import org.codelibs.fess.es.user.cbean.GroupCB;
-import org.codelibs.fess.es.user.exbhv.GroupBhv;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
-import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.cbean.GroupCB;
+import org.codelibs.fess.opensearch.user.exbhv.GroupBhv;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/JobLogService.java b/src/main/java/org/codelibs/fess/app/service/JobLogService.java
index 4a5295af0..9b7738a09 100644
--- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java
@@ -20,10 +20,10 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.JobLogPager;
-import org.codelibs.fess.es.config.cbean.JobLogCB;
-import org.codelibs.fess.es.config.exbhv.JobLogBhv;
-import org.codelibs.fess.es.config.exentity.JobLog;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.JobLogCB;
+import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
index b0ead562d..856b1ed05 100644
--- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
+++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
@@ -21,10 +21,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.KeyMatchPager;
-import org.codelibs.fess.es.config.cbean.KeyMatchCB;
-import org.codelibs.fess.es.config.exbhv.KeyMatchBhv;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.KeyMatchCB;
+import org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
index 148584f67..39e6e68e9 100644
--- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
@@ -21,11 +21,11 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.LabelTypePager;
-import org.codelibs.fess.es.config.cbean.LabelTypeCB;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.LabelTypeCB;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
index 19b9effb6..c9b77402e 100644
--- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
+++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
@@ -22,10 +22,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.PathMapPager;
-import org.codelibs.fess.es.config.cbean.PathMappingCB;
-import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
-import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.PathMappingCB;
+import org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
index b2dfb34af..941c2f420 100644
--- a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
@@ -21,10 +21,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RelatedContentPager;
-import org.codelibs.fess.es.config.cbean.RelatedContentCB;
-import org.codelibs.fess.es.config.exbhv.RelatedContentBhv;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RelatedContentCB;
+import org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
index 386284a77..611c99154 100644
--- a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
@@ -21,10 +21,10 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RelatedQueryPager;
-import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
-import org.codelibs.fess.es.config.exbhv.RelatedQueryBhv;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB;
+import org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
index f4f759a7c..088f040a2 100644
--- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
@@ -20,10 +20,10 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ReqHeaderPager;
-import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
-import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB;
+import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/RoleService.java b/src/main/java/org/codelibs/fess/app/service/RoleService.java
index cbe8d9a2b..c7f4abc30 100644
--- a/src/main/java/org/codelibs/fess/app/service/RoleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java
@@ -22,11 +22,11 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RolePager;
-import org.codelibs.fess.es.user.cbean.RoleCB;
-import org.codelibs.fess.es.user.exbhv.RoleBhv;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
-import org.codelibs.fess.es.user.exentity.Role;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.cbean.RoleCB;
+import org.codelibs.fess.opensearch.user.exbhv.RoleBhv;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
index 733f41402..e5c4ee0dc 100644
--- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
@@ -20,10 +20,10 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RoleTypePager;
-import org.codelibs.fess.es.config.cbean.RoleTypeCB;
-import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
-import org.codelibs.fess.es.config.exentity.RoleType;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RoleTypeCB;
+import org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv;
+import org.codelibs.fess.opensearch.config.exentity.RoleType;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
index 4ebf4e077..293b579d1 100644
--- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
@@ -22,10 +22,10 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SchedulerPager;
-import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
-import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB;
+import org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
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 1874f53ce..507b4d67c 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@@ -33,22 +33,22 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SearchLogPager;
-import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
-import org.codelibs.fess.es.log.cbean.ClickLogCB;
-import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
-import org.codelibs.fess.es.log.cbean.SearchLogCB;
-import org.codelibs.fess.es.log.cbean.UserInfoCB;
-import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.ClickLog;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
-import org.codelibs.fess.es.log.exentity.SearchLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.log.allcommon.EsPagingResultBean;
+import org.codelibs.fess.opensearch.log.cbean.ClickLogCB;
+import org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB;
+import org.codelibs.fess.opensearch.log.cbean.SearchLogCB;
+import org.codelibs.fess.opensearch.log.cbean.UserInfoCB;
+import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.dbflute.optional.OptionalEntity;
 import org.opensearch.search.aggregations.AggregationBuilders;
diff --git a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
index 9b0c3f7f2..bd6d0b04c 100644
--- a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
@@ -15,8 +15,8 @@
  */
 package org.codelibs.fess.app.service;
 
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
 
 import jakarta.annotation.Resource;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/UserService.java b/src/main/java/org/codelibs/fess/app/service/UserService.java
index 28b54539c..8eb4a97a8 100644
--- a/src/main/java/org/codelibs/fess/app/service/UserService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserService.java
@@ -22,11 +22,11 @@
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.UserPager;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
-import org.codelibs.fess.es.user.cbean.UserCB;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.FessUserNotFoundException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.cbean.UserCB;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
index f5b368868..3bde2ec3a 100644
--- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
@@ -20,10 +20,10 @@
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebAuthPager;
-import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
-import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB;
+import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
index 3af2ea858..929f9702e 100644
--- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
@@ -21,12 +21,12 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebConfigPager;
-import org.codelibs.fess.es.config.cbean.WebConfigCB;
-import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
-import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
index d0454972b..322ca2790 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
@@ -30,9 +30,9 @@
 import org.codelibs.fess.app.service.AccessTokenService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
index b238a07d1..83ef0b1d2 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
@@ -54,19 +54,19 @@
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.ClickLog;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
-import org.codelibs.fess.es.log.exentity.SearchLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.GsaConfigParser;
 import org.codelibs.fess.util.RenderDataUtil;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
index afff7e9ea..07a5261b4 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
@@ -35,10 +35,10 @@
 import org.codelibs.fess.app.service.BadWordService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
index ebbb98bdd..a542dccc9 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
@@ -24,8 +24,8 @@
 import org.codelibs.fess.app.service.BoostDocumentRuleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
index e91ca767e..ac7559fb5 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
@@ -36,10 +36,10 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.ds.DataStoreFactory;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
index e5f02506c..09b5de938 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
@@ -23,8 +23,8 @@
 import org.codelibs.fess.app.service.DuplicateHostService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
index f7d0e7572..d30c457af 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
@@ -42,11 +42,11 @@
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
index 6980b68ac..e899218e6 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
@@ -30,9 +30,9 @@
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
index cca074e01..f0bb28b8a 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
@@ -32,10 +32,10 @@
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
index 58cbde330..50f4f940d 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
@@ -27,8 +27,8 @@
 import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.mylasta.action.FessMessages;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
index 19777fbf8..69a86a786 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
@@ -27,9 +27,9 @@
 import org.codelibs.fess.app.service.KeyMatchService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.helper.KeyMatchHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
index f63cc09a9..7da5d8961 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
@@ -31,9 +31,9 @@
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
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 d04c1223f..5941eae58 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
@@ -37,8 +37,8 @@
 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.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig.SimpleImpl;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SearchEngineUtil;
 import org.lastaflute.web.Execute;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
index b2f5ee794..df6b93632 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
@@ -23,8 +23,8 @@
 import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
index afb34e217..3cfabe70f 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
@@ -24,8 +24,8 @@
 import org.codelibs.fess.app.service.RelatedContentService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
index 40128e700..d663eaa1c 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
@@ -31,8 +31,8 @@
 import org.codelibs.fess.app.service.RelatedQueryService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
index b157370b2..a667356e7 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
@@ -29,9 +29,9 @@
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
index 471a9dc5f..7077ffc80 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
@@ -25,7 +25,7 @@
 import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
index 9b9c6ac4e..db6c7fe5e 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
@@ -26,9 +26,9 @@
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.helper.ProcessHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
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 17579abb0..f17cf56f6 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
@@ -29,7 +29,6 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.entity.SearchRenderData;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.QueryHelper;
@@ -37,6 +36,7 @@
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.action.FessMessages;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
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 7d0b3967d..cd631e8c5 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
@@ -29,15 +29,15 @@
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.user.exbhv.RoleBhv;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.user.exbhv.RoleBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.UpgradeUtil;
 import org.codelibs.opensearch.runner.net.OpenSearchCurl;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
index 85d2b7c4d..ee5e6249b 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
@@ -33,8 +33,8 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.mylasta.action.FessMessages;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
index 3f71bb9d1..a7455985a 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
@@ -30,9 +30,9 @@
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
index 2925b6bb8..4537879f7 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
@@ -33,10 +33,10 @@
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
index e97f601f0..13ddb0141 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
@@ -31,10 +31,10 @@
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.crawler.util.CharUtil;
-import org.codelibs.fess.es.config.exentity.FileConfig;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.ProcessHelper;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.JobManager;
 import org.lastaflute.job.key.LaJobUnique;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
index ea0a20c89..1377024fd 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
@@ -35,8 +35,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
index 7040de405..339ac7324 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
@@ -40,9 +40,9 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java
index 17404cf8e..072500bd3 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java
@@ -33,7 +33,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java
index 459e21ea8..98f1376dd 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java
@@ -27,8 +27,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
 import org.codelibs.fess.helper.ProcessHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
index c6a0d2390..25c83275f 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
@@ -34,8 +34,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java
index dbeb18b07..2d2e654f0 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java
@@ -29,10 +29,10 @@
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
 import org.codelibs.fess.app.web.api.admin.searchlist.ApiAdminSearchlistAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.LanguageHelper;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
index 487cd4e12..f0688d21f 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
@@ -31,7 +31,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
index e9adcf689..a273cb405 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
@@ -43,10 +43,10 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SuggestHelper;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java
index 0641cd2f4..0f75c57a5 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java
@@ -27,8 +27,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.helper.ProcessHelper;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
index f33322596..171e24ddb 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
@@ -33,7 +33,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
index e64e242cd..55652d101 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
@@ -34,8 +34,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
index 602c4633a..7fa45872d 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
@@ -28,8 +28,8 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.user.exentity.Group;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.Group;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java
index 52e26d6d4..3125fd2f9 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java
@@ -27,7 +27,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
index ff87ac9e7..526c90108 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
@@ -31,7 +31,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
index c4556735d..213898c06 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
@@ -34,8 +34,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
index 53e9a204b..1ed5dab65 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
@@ -28,7 +28,7 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.PathMapping;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
index 3991c8567..04793df3d 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
@@ -31,7 +31,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
index db4b46ccc..a17ad4982 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
@@ -34,7 +34,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
index 08434c813..00c621b84 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
@@ -33,7 +33,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
index 2c3fba796..2f4276a17 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
@@ -27,7 +27,7 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
index cacef5a9b..01b2389b3 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
@@ -30,7 +30,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.JsonResponse;
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 1017d911f..9c41f6fa2 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
@@ -34,10 +34,10 @@
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
 import org.codelibs.fess.entity.SearchRenderData;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.SearchHelper;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java
index 70f6ee0bb..45a1eeace 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java
@@ -24,7 +24,7 @@
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiStatsResponse;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
index df8873b01..3d9c86ad5 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
@@ -28,7 +28,7 @@
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
index c1ed94b56..8eae2e02e 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
@@ -33,7 +33,7 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
index 5d9b0a0fb..e93c7e550 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
@@ -34,8 +34,8 @@
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java
index 0b17a58f2..e5bea750a 100644
--- a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java
@@ -23,10 +23,10 @@
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.login.LoginAction;
 import org.codelibs.fess.entity.FessUser;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
 import org.codelibs.fess.exception.UserRoleLoginException;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
 import org.codelibs.fess.sso.SsoAuthenticator;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
index ef2e05376..469036b92 100644
--- a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
@@ -28,10 +28,10 @@
 import org.codelibs.fess.app.web.base.FessSearchAction;
 import org.codelibs.fess.app.web.error.ErrorAction;
 import org.codelibs.fess.crawler.util.CharUtil;
-import org.codelibs.fess.es.log.exentity.ClickLog;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SearchLogHelper;
 import org.codelibs.fess.helper.ViewHelper;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.dbflute.util.DfTypeUtil;
diff --git a/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java b/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java
index 5614ef2b1..fb83fbe1b 100644
--- a/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java
+++ b/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java
@@ -20,7 +20,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.codelibs.core.stream.StreamUtil.StreamOf;
 import org.codelibs.fess.auth.chain.AuthenticationChain;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 
 public class AuthenticationManager {
 
diff --git a/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java b/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java
index 69ccb6ba0..243eb3a68 100644
--- a/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java
+++ b/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java
@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.auth.chain;
 
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 
 public interface AuthenticationChain {
 
diff --git a/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java b/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java
index eb61ff6ee..38641c8c9 100644
--- a/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java
+++ b/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java
@@ -34,8 +34,8 @@
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.fess.crawler.Constants;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.CommandExecutionException;
+import org.codelibs.fess.opensearch.user.exentity.User;
 
 public class CommandChain implements AuthenticationChain {
 
diff --git a/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java b/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java
index cda0d3a0a..cba76b2e0 100644
--- a/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java
+++ b/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java
@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.auth.chain;
 
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 
 public class LdapChain implements AuthenticationChain {
diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
index 97c06bd91..399717c5e 100644
--- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
+++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
@@ -43,9 +43,6 @@
 import org.codelibs.fess.crawler.entity.ResponseData;
 import org.codelibs.fess.crawler.entity.UrlQueue;
 import org.codelibs.fess.crawler.log.LogType;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.exception.ContentNotFoundException;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
@@ -55,6 +52,9 @@
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 
diff --git a/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java b/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java
index 54fa0ccdc..fb53939c2 100644
--- a/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java
+++ b/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java
@@ -23,9 +23,9 @@
 import org.codelibs.fess.crawler.entity.EsUrlQueue;
 import org.codelibs.fess.crawler.service.impl.EsUrlQueueService;
 import org.codelibs.fess.crawler.util.EsCrawlerConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
index 7c24bf2db..c72df851e 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
@@ -45,9 +45,6 @@
 import org.codelibs.fess.crawler.transformer.impl.AbstractTransformer;
 import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 import org.codelibs.fess.crawler.util.FieldConfigs;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DocumentHelper;
@@ -57,6 +54,9 @@
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.codelibs.fess.util.ComponentUtil;
 
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
index 6e2960c34..1b2c85713 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
@@ -46,7 +46,6 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
 import org.codelibs.core.misc.ValueHolder;
-import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.builder.RequestDataBuilder;
 import org.codelibs.fess.crawler.entity.AccessResultData;
@@ -60,10 +59,6 @@
 import org.codelibs.fess.crawler.transformer.impl.XpathTransformer;
 import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 import org.codelibs.fess.crawler.util.FieldConfigs;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.XPath;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DocumentHelper;
@@ -73,6 +68,10 @@
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.XPath;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.PrunedTag;
 import org.codelibs.nekohtml.parsers.DOMParser;
diff --git a/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java b/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java
index 0784abe05..7cda6034c 100644
--- a/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java
+++ b/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java
@@ -32,10 +32,10 @@
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 
 public abstract class AbstractDataStore implements DataStore {
diff --git a/src/main/java/org/codelibs/fess/ds/DataStore.java b/src/main/java/org/codelibs/fess/ds/DataStore.java
index 0121f4842..5ec551d1c 100644
--- a/src/main/java/org/codelibs/fess/ds/DataStore.java
+++ b/src/main/java/org/codelibs/fess/ds/DataStore.java
@@ -17,7 +17,7 @@
 
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.config.exentity.DataConfig;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 
 public interface DataStore {
 
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 7baa0d51d..c3dc80231 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
@@ -48,7 +48,6 @@
 import org.codelibs.fess.crawler.rule.RuleManager;
 import org.codelibs.fess.crawler.transformer.Transformer;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.DataStoreCrawlingException;
 import org.codelibs.fess.helper.CrawlerStatsHelper;
 import org.codelibs.fess.helper.CrawlerStatsHelper.StatsAction;
@@ -56,6 +55,7 @@
 import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.opensearch.index.query.QueryBuilders;
diff --git a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java
index 737d9b27a..0329ddf97 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java
@@ -24,7 +24,6 @@
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.DataStoreException;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.IndexingHelper;
@@ -33,6 +32,7 @@
 import org.codelibs.fess.ingest.IngestFactory;
 import org.codelibs.fess.ingest.Ingester;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.DocumentUtil;
diff --git a/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java b/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java
index 66a0965f6..45904a868 100644
--- a/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java
+++ b/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java
@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.exception;
 
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 
 public class JobNotFoundException extends FessSystemException {
 
diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java
index a51c58fd8..a01e521ae 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -47,7 +47,6 @@
 import org.codelibs.fess.app.service.CrawlingInfoService;
 import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.crawler.client.FesenClient;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DataIndexHelper;
@@ -58,6 +57,7 @@
 import org.codelibs.fess.helper.WebFsIndexHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.mylasta.mail.CrawlerPostcard;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.timer.HotThreadMonitorTarget;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index 4c12d8091..4642a5217 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -29,9 +29,9 @@
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.SuggestHelper;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SystemUtil;
diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
index 05151cde8..e51d8c544 100644
--- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
@@ -29,8 +29,8 @@
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SystemUtil;
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
index d0644086d..bb6cbcc71 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
@@ -24,10 +24,10 @@
 import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException;
 import org.codelibs.fess.crawler.helper.impl.LogHelperImpl;
 import org.codelibs.fess.crawler.log.LogType;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.CrawlerStatsHelper.StatsAction;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.codelibs.fess.util.ComponentUtil;
 
 public class CrawlerLogHelper extends LogHelperImpl {
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java
index 2aa143193..316236df0 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java
@@ -30,19 +30,19 @@
 import org.codelibs.fess.app.service.DataConfigService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.service.WebConfigService;
-import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.es.config.exbhv.FailureUrlBhv;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
-import org.codelibs.fess.es.config.exentity.DataConfig;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
-import org.codelibs.fess.es.config.exentity.FileConfig;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index 80a1c7787..430fda60f 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -33,12 +33,12 @@
 import org.codelibs.core.security.MessageDigestUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingInfoService;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
-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.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.aggregations.AggregationBuilders;
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index c5c00a139..45296c2bc 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -29,9 +29,9 @@
 import org.codelibs.fess.ds.DataStoreFactory;
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java
index aba265c2e..f8a4c6917 100644
--- a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java
@@ -53,10 +53,10 @@
 import org.codelibs.fess.crawler.rule.RuleManager;
 import org.codelibs.fess.crawler.transformer.Transformer;
 import org.codelibs.fess.crawler.util.TextUtil;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.lastaflute.di.core.exception.ComponentNotFoundException;
diff --git a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java
index 2d8b15473..ffd842512 100644
--- a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java
@@ -21,7 +21,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.app.service.DuplicateHostService;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.codelibs.fess.util.ComponentUtil;
 
 import jakarta.annotation.PostConstruct;
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 756dba06b..f2e940dfb 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -22,9 +22,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.search.TotalHits;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.client.SearchEngineClientException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.client.SearchEngineClientException;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
diff --git a/src/main/java/org/codelibs/fess/helper/JobHelper.java b/src/main/java/org/codelibs/fess/helper/JobHelper.java
index 9f70a64e4..776568853 100644
--- a/src/main/java/org/codelibs/fess/helper/JobHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/JobHelper.java
@@ -25,12 +25,12 @@
 import org.codelibs.core.timer.TimeoutTarget;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exbhv.JobLogBhv;
-import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
-import org.codelibs.fess.es.config.exentity.JobLog;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.exception.ScheduledJobException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
+import org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.job.JobManager;
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index b9c54af30..237958e7c 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -28,11 +28,11 @@
 import org.codelibs.core.misc.Tuple3;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.client.SearchEngineClient.SearchConditionBuilder;
-import org.codelibs.fess.es.config.exbhv.KeyMatchBhv;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.client.SearchEngineClient.SearchConditionBuilder;
+import org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.opensearch.index.query.BoolQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java
index 962e13795..0798fb557 100644
--- a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java
@@ -34,7 +34,7 @@
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
-import org.codelibs.fess.es.config.exentity.LabelType;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 
 import jakarta.annotation.PostConstruct;
diff --git a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java
index 65ef22bf8..d671628f2 100644
--- a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java
@@ -26,8 +26,8 @@
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
-import org.codelibs.fess.es.config.exentity.PathMapping;
+import org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.lastaflute.di.core.exception.ComponentNotFoundException;
diff --git a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java
index a82054943..d51587078 100644
--- a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java
@@ -27,8 +27,8 @@
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fess.es.config.exbhv.RelatedContentBhv;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
+import org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 
 import jakarta.annotation.PostConstruct;
diff --git a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java
index 35fdd35d1..d727f6122 100644
--- a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java
@@ -24,8 +24,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.config.exbhv.RelatedQueryBhv;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
+import org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 
 import jakarta.annotation.PostConstruct;
diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
index 1a394dc49..11873e52d 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
@@ -38,11 +38,11 @@
 import org.codelibs.fess.entity.SearchRenderData;
 import org.codelibs.fess.entity.SearchRequestParams;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
-import org.codelibs.fess.es.client.SearchEngineClient.SearchConditionBuilder;
-import org.codelibs.fess.es.client.SearchEngineClientException;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient.SearchConditionBuilder;
+import org.codelibs.fess.opensearch.client.SearchEngineClientException;
 import org.codelibs.fess.query.QueryFieldConfig;
 import org.codelibs.fess.rank.fusion.RankFusionProcessor;
 import org.codelibs.fess.util.BooleanFunction;
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index 2897272c1..640364ad1 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -40,15 +40,15 @@
 import org.codelibs.fess.entity.SearchLogEvent;
 import org.codelibs.fess.entity.SearchRequestParams;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
-import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.ClickLog;
-import org.codelibs.fess.es.log.exentity.SearchLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.QueryResponseList;
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index d8f3fd9ed..c62c5c54f 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -37,14 +37,14 @@
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Pair;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exbhv.BadWordBhv;
-import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
-import org.codelibs.fess.es.config.exentity.BadWord;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
-import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.es.log.exentity.SearchLog;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exbhv.BadWordBhv;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
+import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
 import org.codelibs.fess.suggest.Suggester;
 import org.codelibs.fess.suggest.constants.FieldNames;
 import org.codelibs.fess.suggest.entity.SuggestItem;
diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
index de808d36a..0f9d7cc17 100644
--- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
@@ -62,11 +62,11 @@
 import org.codelibs.fess.entity.FacetQueryView;
 import org.codelibs.fess.entity.HighlightInfo;
 import org.codelibs.fess.entity.SearchRenderData;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.UserAgentHelper.UserAgentType;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.FacetResponse;
diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java
index c7be673f6..b9e80b41a 100644
--- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java
@@ -36,13 +36,13 @@
 import org.codelibs.fess.crawler.service.impl.EsDataService;
 import org.codelibs.fess.crawler.service.impl.EsUrlFilterService;
 import org.codelibs.fess.crawler.service.impl.EsUrlQueueService;
-import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
-import org.codelibs.fess.es.config.exentity.FileConfig;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.indexer.IndexUpdater;
+import org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 
 public class WebFsIndexHelper {
diff --git a/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java b/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java
index cc6831ad3..0556bc235 100644
--- a/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java
+++ b/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.util.ComponentUtil;
 
 public class DocBoostMatcher {
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index 6d16d0169..1e8cc8049 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -36,9 +36,6 @@
 import org.codelibs.fess.crawler.service.impl.EsDataService;
 import org.codelibs.fess.crawler.transformer.Transformer;
 import org.codelibs.fess.crawler.util.EsResultList;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.IndexingHelper;
@@ -48,6 +45,9 @@
 import org.codelibs.fess.ingest.IngestFactory;
 import org.codelibs.fess.ingest.Ingester;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.MemoryUtil;
diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java
index a271f2434..e23a21efb 100644
--- a/src/main/java/org/codelibs/fess/job/CrawlJob.java
+++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java
@@ -31,12 +31,12 @@
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
 import org.codelibs.fess.exception.JobProcessingException;
 import org.codelibs.fess.exec.Crawler;
 import org.codelibs.fess.helper.ProcessHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.InputStreamThread;
 import org.codelibs.fess.util.JobProcess;
diff --git a/src/main/java/org/codelibs/fess/job/ExecJob.java b/src/main/java/org/codelibs/fess/job/ExecJob.java
index 695f20ce1..8b127d38f 100644
--- a/src/main/java/org/codelibs/fess/job/ExecJob.java
+++ b/src/main/java/org/codelibs/fess/job/ExecJob.java
@@ -32,7 +32,7 @@
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.exception.IORuntimeException;
 import org.lastaflute.job.LaJobRuntime;
diff --git a/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java b/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java
index 082a5d6ae..e5f82938c 100644
--- a/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java
+++ b/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java
@@ -21,11 +21,11 @@
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.entity.PingResponse;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.helper.NotificationHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.mylasta.mail.EsStatusPostcard;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.mail.send.hook.SMailCallbackContext;
 import org.lastaflute.core.mail.Postbox;
diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index 1813e0ef3..373f1f220 100644
--- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
+++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
@@ -17,8 +17,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
diff --git a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
index 7d20dd700..7dcd27f9e 100644
--- a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
+++ b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
@@ -22,10 +22,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.helper.LanguageHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java
index 4b7796821..f63afdfa6 100644
--- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java
+++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java
@@ -50,13 +50,13 @@
 import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FessUser;
-import org.codelibs.fess.es.user.exentity.Group;
-import org.codelibs.fess.es.user.exentity.Role;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.LdapConfigurationException;
 import org.codelibs.fess.exception.LdapOperationException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.exentity.Group;
+import org.codelibs.fess.opensearch.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.OptionalUtil;
 import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java b/src/main/java/org/codelibs/fess/opensearch/client/CrawlerEngineClient.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
rename to src/main/java/org/codelibs/fess/opensearch/client/CrawlerEngineClient.java
index 8d4f3a30a..efac392d6 100644
--- a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
+++ b/src/main/java/org/codelibs/fess/opensearch/client/CrawlerEngineClient.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.client;
+package org.codelibs.fess.opensearch.client;
 
 import static org.codelibs.core.stream.StreamUtil.split;
 
diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/opensearch/client/SearchEngineClient.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
rename to src/main/java/org/codelibs/fess/opensearch/client/SearchEngineClient.java
index 0b149999e..cc5fef0be 100644
--- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
+++ b/src/main/java/org/codelibs/fess/opensearch/client/SearchEngineClient.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.client;
+package org.codelibs.fess.opensearch.client;
 
 import static org.codelibs.core.stream.StreamUtil.split;
 import static org.codelibs.core.stream.StreamUtil.stream;
diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java b/src/main/java/org/codelibs/fess/opensearch/client/SearchEngineClientException.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java
rename to src/main/java/org/codelibs/fess/opensearch/client/SearchEngineClientException.java
index 6f7a057be..cca6ed17a 100644
--- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java
+++ b/src/main/java/org/codelibs/fess/opensearch/client/SearchEngineClientException.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.client;
+package org.codelibs.fess.opensearch.client;
 
 import org.codelibs.fess.exception.FessSystemException;
 
diff --git a/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java b/src/main/java/org/codelibs/fess/opensearch/common/ImplementedInvokerAssistant.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java
rename to src/main/java/org/codelibs/fess/opensearch/common/ImplementedInvokerAssistant.java
index e4c12876e..e4bde1220 100644
--- a/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java
+++ b/src/main/java/org/codelibs/fess/opensearch/common/ImplementedInvokerAssistant.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.common;
+package org.codelibs.fess.opensearch.common;
 
 import javax.sql.DataSource;
 
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractBehavior.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractBehavior.java
index 80ec5bd34..7746fa6f9 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractBehavior.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta;
-import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.DocMeta;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
 import org.dbflute.bhv.AbstractBehaviorWritable;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionAggregation.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionAggregation.java
index 62dcf98e1..f60491a7a 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionAggregation.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionBean.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionBean.java
index b08980108..1e67974d2 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionBean.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionQuery.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionQuery.java
index f3c75c772..d1189cbd9 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractConditionQuery.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractEntity.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractEntity.java
index ea06bb725..7224d92aa 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsAbstractEntity.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsPagingResultBean.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsPagingResultBean.java
index 1ae19f182..7f4ee9e5c 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsPagingResultBean.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import org.apache.lucene.search.TotalHits;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsSqlClause.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java
rename to src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsSqlClause.java
index df23485d2..eeba66d30 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/allcommon/EsSqlClause.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.config.allcommon;
 
 import org.dbflute.cbean.sqlclause.AbstractSqlClause;
 import org.dbflute.dbway.DBWay;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsAccessTokenBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsAccessTokenBhv.java
index aa9a1d162..b8e8e51b1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsAccessTokenBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.AccessTokenCB;
-import org.codelibs.fess.es.config.exentity.AccessToken;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.AccessTokenDbm;
+import org.codelibs.fess.opensearch.config.cbean.AccessTokenCB;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsBadWordBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsBadWordBhv.java
index d6691f40f..dcb7791a1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsBadWordBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.BadWordCB;
-import org.codelibs.fess.es.config.exentity.BadWord;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.BadWordDbm;
+import org.codelibs.fess.opensearch.config.cbean.BadWordCB;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsBoostDocumentRuleBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsBoostDocumentRuleBhv.java
index 353f7a11d..255395015 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.BoostDocumentRuleDbm;
+import org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsCrawlingInfoBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsCrawlingInfoBhv.java
index 3fd3b4874..c5cc0634a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsCrawlingInfoBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.CrawlingInfoDbm;
+import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoCB;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsCrawlingInfoParamBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsCrawlingInfoParamBhv.java
index 5761883a2..1063091ae 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsCrawlingInfoParamBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB;
-import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.CrawlingInfoParamDbm;
+import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoParamCB;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsDataConfigBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsDataConfigBhv.java
index 6d7d53480..e8c4f167b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsDataConfigBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.DataConfigCB;
-import org.codelibs.fess.es.config.exentity.DataConfig;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.DataConfigDbm;
+import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsDuplicateHostBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsDuplicateHostBhv.java
index 36b7d4e5e..a77b8b246 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsDuplicateHostBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.DuplicateHostDbm;
+import org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsElevateWordBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsElevateWordBhv.java
index 4c16147db..26ace0405 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsElevateWordBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ElevateWordCB;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ElevateWordDbm;
+import org.codelibs.fess.opensearch.config.cbean.ElevateWordCB;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsElevateWordToLabelBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsElevateWordToLabelBhv.java
index f76c0a359..8d7c278b4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsElevateWordToLabelBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
-import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ElevateWordToLabelDbm;
+import org.codelibs.fess.opensearch.config.cbean.ElevateWordToLabelCB;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFailureUrlBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFailureUrlBhv.java
index 807e3bea2..311081a53 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFailureUrlBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.FailureUrlCB;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FailureUrlDbm;
+import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFileAuthenticationBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFileAuthenticationBhv.java
index b2a0407da..db71fb526 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFileAuthenticationBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FileAuthenticationDbm;
+import org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFileConfigBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFileConfigBhv.java
index d0a3981c7..08727926c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsFileConfigBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.FileConfigCB;
-import org.codelibs.fess.es.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FileConfigDbm;
+import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsJobLogBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsJobLogBhv.java
index 631bfbc26..411f8bb47 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsJobLogBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.JobLogCB;
-import org.codelibs.fess.es.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.JobLogDbm;
+import org.codelibs.fess.opensearch.config.cbean.JobLogCB;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsKeyMatchBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsKeyMatchBhv.java
index 70daa8dd8..8bcf6d252 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsKeyMatchBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.KeyMatchCB;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.KeyMatchDbm;
+import org.codelibs.fess.opensearch.config.cbean.KeyMatchCB;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsLabelTypeBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsLabelTypeBhv.java
index c78ba7e0f..afc7e5bc9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsLabelTypeBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.LabelTypeCB;
-import org.codelibs.fess.es.config.exentity.LabelType;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.LabelTypeDbm;
+import org.codelibs.fess.opensearch.config.cbean.LabelTypeCB;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsPathMappingBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsPathMappingBhv.java
index f0aab24bf..b94d3a397 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsPathMappingBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.PathMappingCB;
-import org.codelibs.fess.es.config.exentity.PathMapping;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.PathMappingDbm;
+import org.codelibs.fess.opensearch.config.cbean.PathMappingCB;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRelatedContentBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRelatedContentBhv.java
index f4763db60..890f0e7d6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRelatedContentBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.RelatedContentCB;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RelatedContentDbm;
+import org.codelibs.fess.opensearch.config.cbean.RelatedContentCB;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRelatedQueryBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRelatedQueryBhv.java
index 0104bfcdc..1480f40cd 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRelatedQueryBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RelatedQueryDbm;
+import org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRequestHeaderBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRequestHeaderBhv.java
index 58b3fc6bd..708f0beea 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRequestHeaderBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RequestHeaderDbm;
+import org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRoleTypeBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRoleTypeBhv.java
index bb5790372..56978b191 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsRoleTypeBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.RoleTypeCB;
-import org.codelibs.fess.es.config.exentity.RoleType;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RoleTypeDbm;
+import org.codelibs.fess.opensearch.config.cbean.RoleTypeCB;
+import org.codelibs.fess.opensearch.config.exentity.RoleType;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsScheduledJobBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsScheduledJobBhv.java
index f7f8c9f70..a83e6e152 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsScheduledJobBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ScheduledJobDbm;
+import org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsThumbnailQueueBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsThumbnailQueueBhv.java
index 3fba5b6db..d70773753 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsThumbnailQueueBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ThumbnailQueueCB;
-import org.codelibs.fess.es.config.exentity.ThumbnailQueue;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ThumbnailQueueDbm;
+import org.codelibs.fess.opensearch.config.cbean.ThumbnailQueueCB;
+import org.codelibs.fess.opensearch.config.exentity.ThumbnailQueue;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsWebAuthenticationBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsWebAuthenticationBhv.java
index 9b58f1329..a12a47a9f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsWebAuthenticationBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.WebAuthenticationDbm;
+import org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsWebConfigBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsWebConfigBhv.java
index 36d2bf4dd..428c469e6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsbhv/BsWebConfigBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsbhv;
+package org.codelibs.fess.opensearch.config.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.WebConfigCB;
-import org.codelibs.fess.es.config.exentity.WebConfig;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.WebConfigDbm;
+import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsAccessToken.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsAccessToken.java
index 366fb1b2e..1ec032bb3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsAccessToken.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.AccessTokenDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsBadWord.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsBadWord.java
index 96e91c6c2..e290a6f7b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsBadWord.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.BadWordDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsBoostDocumentRule.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsBoostDocumentRule.java
index ecca7f1c6..870993859 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsBoostDocumentRule.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.BoostDocumentRuleDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsCrawlingInfo.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsCrawlingInfo.java
index 3dce81d9b..7a819675c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsCrawlingInfo.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.CrawlingInfoDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsCrawlingInfoParam.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsCrawlingInfoParam.java
index 853133402..e103b455c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsCrawlingInfoParam.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.CrawlingInfoParamDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsDataConfig.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsDataConfig.java
index 377e57f3f..d5a08a78b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsDataConfig.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.DataConfigDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsDuplicateHost.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsDuplicateHost.java
index f2ef8a480..08a7a3482 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsDuplicateHost.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.DuplicateHostDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsElevateWord.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsElevateWord.java
index e508fc43f..b7ea33f5d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsElevateWord.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ElevateWordDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsElevateWordToLabel.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsElevateWordToLabel.java
index 1a61a6401..9f487f366 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsElevateWordToLabel.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ElevateWordToLabelDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFailureUrl.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFailureUrl.java
index 1ac63df99..15f8fdd25 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFailureUrl.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FailureUrlDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFileAuthentication.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFileAuthentication.java
index 6500f59e8..49bd64edb 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFileAuthentication.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FileAuthenticationDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFileConfig.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFileConfig.java
index af67a58a9..314f1f221 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsFileConfig.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FileConfigDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsJobLog.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsJobLog.java
index 1d7cdf50b..40ffa2581 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsJobLog.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.JobLogDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsKeyMatch.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsKeyMatch.java
index 4f288da6f..1754d5c05 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsKeyMatch.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.KeyMatchDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsLabelType.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsLabelType.java
index 42c8ada43..95cbae019 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsLabelType.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.LabelTypeDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsPathMapping.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsPathMapping.java
index 4a58fef2d..994c576e4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsPathMapping.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.PathMappingDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRelatedContent.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRelatedContent.java
index ec48fd2c2..25de378d4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRelatedContent.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RelatedContentDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRelatedQuery.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRelatedQuery.java
index 80e49ebf9..9eef60c19 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRelatedQuery.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RelatedQueryDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRequestHeader.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRequestHeader.java
index dd4747969..ea3f5edbf 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRequestHeader.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RequestHeaderDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRoleType.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRoleType.java
index 4f58b5135..6751591a8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsRoleType.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RoleTypeDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsScheduledJob.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsScheduledJob.java
index 9ccd549c5..31f3faf60 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsScheduledJob.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ScheduledJobDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsThumbnailQueue.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsThumbnailQueue.java
index b67a9c0a0..7034e86d2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsThumbnailQueue.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ThumbnailQueueDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsWebAuthentication.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsWebAuthentication.java
index af74ebfeb..b63cdc2a2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsWebAuthentication.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.WebAuthenticationDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsWebConfig.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsWebConfig.java
index 7d9a1073d..32c409a50 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/BsWebConfig.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity;
+package org.codelibs.fess.opensearch.config.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.WebConfigDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/AccessTokenDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/AccessTokenDbm.java
index 6e0dc3179..b434b7534 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/AccessTokenDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.AccessToken;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -223,17 +223,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.AccessToken";
+        return "org.codelibs.fess.opensearch.config.exentity.AccessToken";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.AccessTokenCB";
+        return "org.codelibs.fess.opensearch.config.cbean.AccessTokenCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.AccessTokenBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.AccessTokenBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/BadWordDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/BadWordDbm.java
index 270876b6a..8046f9ef1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/BadWordDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.BadWord;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -207,17 +207,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.BadWord";
+        return "org.codelibs.fess.opensearch.config.exentity.BadWord";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.BadWordCB";
+        return "org.codelibs.fess.opensearch.config.cbean.BadWordCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.BadWordBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.BadWordBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
index 158ad2994..e1efabaeb 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -207,17 +207,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.BoostDocumentRule";
+        return "org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB";
+        return "org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/CrawlingInfoDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/CrawlingInfoDbm.java
index dc2c0ee38..397b7b385 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/CrawlingInfoDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -179,17 +179,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.CrawlingInfo";
+        return "org.codelibs.fess.opensearch.config.exentity.CrawlingInfo";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.CrawlingInfoCB";
+        return "org.codelibs.fess.opensearch.config.cbean.CrawlingInfoCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
index 658c01e7b..090a70c64 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -180,17 +180,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.CrawlingInfoParam";
+        return "org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB";
+        return "org.codelibs.fess.opensearch.config.cbean.CrawlingInfoParamCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoParamBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/DataConfigDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/DataConfigDbm.java
index 55941a314..5e03ef805 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/DataConfigDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.DataConfig;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -268,17 +268,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.DataConfig";
+        return "org.codelibs.fess.opensearch.config.exentity.DataConfig";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.DataConfigCB";
+        return "org.codelibs.fess.opensearch.config.cbean.DataConfigCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.DataConfigBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/DuplicateHostDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/DuplicateHostDbm.java
index f84bbb2e9..d3ad900ff 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/DuplicateHostDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -207,17 +207,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.DuplicateHost";
+        return "org.codelibs.fess.opensearch.config.exentity.DuplicateHost";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.DuplicateHostCB";
+        return "org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.DuplicateHostBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.DuplicateHostBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ElevateWordDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ElevateWordDbm.java
index 9278e3fa0..b073b1ac9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ElevateWordDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.ElevateWord;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -215,17 +215,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.ElevateWord";
+        return "org.codelibs.fess.opensearch.config.exentity.ElevateWord";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.ElevateWordCB";
+        return "org.codelibs.fess.opensearch.config.cbean.ElevateWordCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.ElevateWordBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
index 544cd30f5..0c0534238 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -162,17 +162,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.ElevateWordToLabel";
+        return "org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB";
+        return "org.codelibs.fess.opensearch.config.cbean.ElevateWordToLabelCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FailureUrlDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FailureUrlDbm.java
index f85e7a954..589d3981c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FailureUrlDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.FailureUrl;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -206,17 +206,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.FailureUrl";
+        return "org.codelibs.fess.opensearch.config.exentity.FailureUrl";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.FailureUrlCB";
+        return "org.codelibs.fess.opensearch.config.cbean.FailureUrlCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.FailureUrlBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FileAuthenticationDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FileAuthenticationDbm.java
index db66d45c8..facd54ef5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FileAuthenticationDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -243,17 +243,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.FileAuthentication";
+        return "org.codelibs.fess.opensearch.config.exentity.FileAuthentication";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.FileAuthenticationCB";
+        return "org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FileConfigDbm.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FileConfigDbm.java
index 8245a8e1f..6d59dac31 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/FileConfigDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -338,17 +338,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.FileConfig";
+        return "org.codelibs.fess.opensearch.config.exentity.FileConfig";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.FileConfigCB";
+        return "org.codelibs.fess.opensearch.config.cbean.FileConfigCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.FileConfigBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/JobLogDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/JobLogDbm.java
index ef0a577a3..a3b4124f4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/JobLogDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -220,17 +220,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.JobLog";
+        return "org.codelibs.fess.opensearch.config.exentity.JobLog";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.JobLogCB";
+        return "org.codelibs.fess.opensearch.config.cbean.JobLogCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.JobLogBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.JobLogBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/KeyMatchDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/KeyMatchDbm.java
index 3470de3e2..b891ac582 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/KeyMatchDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.KeyMatch;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -221,17 +221,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.KeyMatch";
+        return "org.codelibs.fess.opensearch.config.exentity.KeyMatch";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.KeyMatchCB";
+        return "org.codelibs.fess.opensearch.config.cbean.KeyMatchCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.KeyMatchBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/LabelTypeDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/LabelTypeDbm.java
index 8eef7aca8..27c64da2e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/LabelTypeDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.LabelType;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -241,17 +241,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.LabelType";
+        return "org.codelibs.fess.opensearch.config.exentity.LabelType";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.LabelTypeCB";
+        return "org.codelibs.fess.opensearch.config.cbean.LabelTypeCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.LabelTypeBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/PathMappingDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/PathMappingDbm.java
index 98dd2ad5e..3d3d90798 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/PathMappingDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.PathMapping;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -224,17 +224,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.PathMapping";
+        return "org.codelibs.fess.opensearch.config.exentity.PathMapping";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.PathMappingCB";
+        return "org.codelibs.fess.opensearch.config.cbean.PathMappingCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.PathMappingBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RelatedContentDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RelatedContentDbm.java
index 546222d12..7443cb1ea 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RelatedContentDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.RelatedContent;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -216,17 +216,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.RelatedContent";
+        return "org.codelibs.fess.opensearch.config.exentity.RelatedContent";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.RelatedContentCB";
+        return "org.codelibs.fess.opensearch.config.cbean.RelatedContentCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.RelatedContentBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RelatedQueryDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RelatedQueryDbm.java
index 950a0a314..b9daafeaa 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RelatedQueryDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -205,17 +205,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.RelatedQuery";
+        return "org.codelibs.fess.opensearch.config.exentity.RelatedQuery";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.RelatedQueryCB";
+        return "org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.RelatedQueryBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RequestHeaderDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RequestHeaderDbm.java
index 4e913fe4a..5a334f634 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RequestHeaderDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.RequestHeader;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -206,17 +206,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.RequestHeader";
+        return "org.codelibs.fess.opensearch.config.exentity.RequestHeader";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.RequestHeaderCB";
+        return "org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.RequestHeaderBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RoleTypeDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RoleTypeDbm.java
index 201617cbf..fbd65328d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/RoleTypeDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.RoleType;
+import org.codelibs.fess.opensearch.config.exentity.RoleType;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -205,17 +205,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.RoleType";
+        return "org.codelibs.fess.opensearch.config.exentity.RoleType";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.RoleTypeCB";
+        return "org.codelibs.fess.opensearch.config.cbean.RoleTypeCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.RoleTypeBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ScheduledJobDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ScheduledJobDbm.java
index f79ee6f47..c27ba4aa5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ScheduledJobDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -260,17 +260,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.ScheduledJob";
+        return "org.codelibs.fess.opensearch.config.exentity.ScheduledJob";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.ScheduledJobCB";
+        return "org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.ScheduledJobBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ThumbnailQueueDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ThumbnailQueueDbm.java
index c12ae6d7e..ab1ac135d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/ThumbnailQueueDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.ThumbnailQueue;
+import org.codelibs.fess.opensearch.config.exentity.ThumbnailQueue;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -198,17 +198,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.ThumbnailQueue";
+        return "org.codelibs.fess.opensearch.config.exentity.ThumbnailQueue";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.ThumbnailQueueCB";
+        return "org.codelibs.fess.opensearch.config.cbean.ThumbnailQueueCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.ThumbnailQueueBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/WebAuthenticationDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/WebAuthenticationDbm.java
index 47d92ae7a..198ca5ab8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/WebAuthenticationDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -252,17 +252,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.WebAuthentication";
+        return "org.codelibs.fess.opensearch.config.exentity.WebAuthentication";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.WebAuthenticationCB";
+        return "org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/WebConfigDbm.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/WebConfigDbm.java
index a71e401cf..e2a89ad15 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/bsentity/dbmeta/WebConfigDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.config.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.WebConfig;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -347,17 +347,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.WebConfig";
+        return "org.codelibs.fess.opensearch.config.exentity.WebConfig";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.WebConfigCB";
+        return "org.codelibs.fess.opensearch.config.cbean.WebConfigCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.WebConfigBhv";
+        return "org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/AccessTokenCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/AccessTokenCB.java
index d7a3fb8b1..f7208f026 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/AccessTokenCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsAccessTokenCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsAccessTokenCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/BadWordCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/BadWordCB.java
index d4f04951e..656303dd4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/BadWordCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsBadWordCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsBadWordCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/BoostDocumentRuleCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/BoostDocumentRuleCB.java
index 2220f81f0..21a487b12 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/BoostDocumentRuleCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsBoostDocumentRuleCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsBoostDocumentRuleCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/CrawlingInfoCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/CrawlingInfoCB.java
index 4e8a330bd..17f3c497d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/CrawlingInfoCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsCrawlingInfoCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsCrawlingInfoCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/CrawlingInfoParamCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/CrawlingInfoParamCB.java
index 8120fec88..39e3142a6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/CrawlingInfoParamCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsCrawlingInfoParamCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsCrawlingInfoParamCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/DataConfigCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/DataConfigCB.java
index e2cf64b23..ce9646998 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/DataConfigCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsDataConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsDataConfigCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/DuplicateHostCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/DuplicateHostCB.java
index 70281a1fb..7a5c03805 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/DuplicateHostCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsDuplicateHostCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsDuplicateHostCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ElevateWordCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ElevateWordCB.java
index f9d68c72b..f54479056 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ElevateWordCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsElevateWordCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsElevateWordCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ElevateWordToLabelCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ElevateWordToLabelCB.java
index e6d8c8586..ca9266f9d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ElevateWordToLabelCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsElevateWordToLabelCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsElevateWordToLabelCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/FailureUrlCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/FailureUrlCB.java
index baabc3bba..d6e7fc7de 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/FailureUrlCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsFailureUrlCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsFailureUrlCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/FileAuthenticationCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/FileAuthenticationCB.java
index 7e23c4fdf..1e2e3eb04 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/FileAuthenticationCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsFileAuthenticationCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsFileAuthenticationCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/FileConfigCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/FileConfigCB.java
index aac39dd8e..345030978 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/FileConfigCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsFileConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsFileConfigCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/JobLogCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/JobLogCB.java
index fb6d1a450..257ddb2c3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/JobLogCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsJobLogCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsJobLogCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/KeyMatchCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/KeyMatchCB.java
index 5eed6d88b..4a902464b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/KeyMatchCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsKeyMatchCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsKeyMatchCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/LabelTypeCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/LabelTypeCB.java
index 5d36f3501..7aa1c141c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/LabelTypeCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsLabelTypeCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsLabelTypeCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/PathMappingCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/PathMappingCB.java
index eca08cd1a..d7f625cc5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/PathMappingCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsPathMappingCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsPathMappingCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RelatedContentCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/RelatedContentCB.java
index 4c8be16ca..c6e7403a5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RelatedContentCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsRelatedContentCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsRelatedContentCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RelatedQueryCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/RelatedQueryCB.java
index 6b46a7788..4202971ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RelatedQueryCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsRelatedQueryCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsRelatedQueryCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RequestHeaderCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/RequestHeaderCB.java
index 1ad5c975d..86d24b739 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RequestHeaderCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsRequestHeaderCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsRequestHeaderCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RoleTypeCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/RoleTypeCB.java
index 0da5a83e6..5e9c17712 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/RoleTypeCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsRoleTypeCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsRoleTypeCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ScheduledJobCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ScheduledJobCB.java
index 53bec3b5e..b7c41ef38 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ScheduledJobCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsScheduledJobCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsScheduledJobCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ThumbnailQueueCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ThumbnailQueueCB.java
index cedffa75d..7e4c0089b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ThumbnailQueueCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsThumbnailQueueCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsThumbnailQueueCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/WebAuthenticationCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/WebAuthenticationCB.java
index 0286abd58..693b12400 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/WebAuthenticationCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsWebAuthenticationCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsWebAuthenticationCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/WebConfigCB.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/WebConfigCB.java
index 4d0519204..552232779 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/WebConfigCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean;
+package org.codelibs.fess.opensearch.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsWebConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.bs.BsWebConfigCB;
 
 /**
  * @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/opensearch/config/cbean/bs/BsAccessTokenCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsAccessTokenCB.java
index f678b9060..8c477d159 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsAccessTokenCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.AccessTokenCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.AccessTokenDbm;
+import org.codelibs.fess.opensearch.config.cbean.AccessTokenCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.AccessTokenCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsAccessTokenCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.AccessTokenCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsAccessTokenCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsBadWordCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsBadWordCB.java
index 7ff2603f5..fdf87db9a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsBadWordCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.BadWordCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.BadWordDbm;
+import org.codelibs.fess.opensearch.config.cbean.BadWordCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.BadWordCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsBadWordCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.BadWordCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsBadWordCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsBoostDocumentRuleCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsBoostDocumentRuleCB.java
index 6a0a7c026..a57d63be1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsBoostDocumentRuleCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.BoostDocumentRuleCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.BoostDocumentRuleDbm;
+import org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.BoostDocumentRuleCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsBoostDocumentRuleCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.BoostDocumentRuleCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsCrawlingInfoCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsCrawlingInfoCB.java
index dabc94253..d8bce8537 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsCrawlingInfoCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.CrawlingInfoDbm;
+import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.CrawlingInfoCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsCrawlingInfoCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.CrawlingInfoCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsCrawlingInfoParamCB.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsCrawlingInfoParamCB.java
index e0596f992..eac9f2109 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsCrawlingInfoParamCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoParamCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.CrawlingInfoParamDbm;
+import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoParamCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.CrawlingInfoParamCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsCrawlingInfoParamCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.CrawlingInfoParamCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsDataConfigCB.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsDataConfigCB.java
index c33ee74f4..6b75711f5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsDataConfigCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.DataConfigCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.DataConfigDbm;
+import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.DataConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsDataConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.DataConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsDataConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsDuplicateHostCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsDuplicateHostCB.java
index dd90e5a27..e9e7f406b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsDuplicateHostCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.DuplicateHostCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.DuplicateHostDbm;
+import org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.DuplicateHostCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsDuplicateHostCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.DuplicateHostCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsElevateWordCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsElevateWordCB.java
index 5a3044ef7..0be913c7d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsElevateWordCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.ElevateWordCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ElevateWordDbm;
+import org.codelibs.fess.opensearch.config.cbean.ElevateWordCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.ElevateWordCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsElevateWordCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ElevateWordCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsElevateWordCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsElevateWordToLabelCB.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsElevateWordToLabelCB.java
index 1115063bc..f810c8d32 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsElevateWordToLabelCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.ElevateWordToLabelCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ElevateWordToLabelDbm;
+import org.codelibs.fess.opensearch.config.cbean.ElevateWordToLabelCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.ElevateWordToLabelCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsElevateWordToLabelCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ElevateWordToLabelCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFailureUrlCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFailureUrlCB.java
index ddbad61ac..88ed816ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFailureUrlCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.FailureUrlCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FailureUrlDbm;
+import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.FailureUrlCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsFailureUrlCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.FailureUrlCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFailureUrlCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFileAuthenticationCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFileAuthenticationCB.java
index 16d1d3f3f..7f730f9e3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFileAuthenticationCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.FileAuthenticationCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FileAuthenticationDbm;
+import org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.FileAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsFileAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.FileAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFileAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFileConfigCB.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFileConfigCB.java
index f762dc901..0ef079d68 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsFileConfigCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.FileConfigCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.FileConfigDbm;
+import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.FileConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsFileConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.FileConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFileConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsJobLogCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsJobLogCB.java
index 1fd6c201c..56a722f69 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsJobLogCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.JobLogCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.JobLogDbm;
+import org.codelibs.fess.opensearch.config.cbean.JobLogCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.JobLogCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsJobLogCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.JobLogCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsJobLogCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsKeyMatchCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsKeyMatchCB.java
index baa807761..d7ea46559 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsKeyMatchCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.KeyMatchCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.KeyMatchDbm;
+import org.codelibs.fess.opensearch.config.cbean.KeyMatchCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.KeyMatchCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsKeyMatchCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.KeyMatchCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsKeyMatchCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsLabelTypeCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsLabelTypeCB.java
index d47ce6de1..b42ba2245 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsLabelTypeCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.LabelTypeCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.LabelTypeDbm;
+import org.codelibs.fess.opensearch.config.cbean.LabelTypeCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.LabelTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsLabelTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.LabelTypeCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsLabelTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsPathMappingCB.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsPathMappingCB.java
index aa6e816b0..d6224ea13 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsPathMappingCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.PathMappingCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.PathMappingDbm;
+import org.codelibs.fess.opensearch.config.cbean.PathMappingCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.PathMappingCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsPathMappingCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.PathMappingCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsPathMappingCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRelatedContentCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRelatedContentCB.java
index 87738bf4a..2702029cf 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRelatedContentCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.RelatedContentCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RelatedContentDbm;
+import org.codelibs.fess.opensearch.config.cbean.RelatedContentCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.RelatedContentCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRelatedContentCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RelatedContentCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRelatedContentCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRelatedQueryCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRelatedQueryCB.java
index 5caa79dd0..6f01a7ac3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRelatedQueryCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.RelatedQueryCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RelatedQueryDbm;
+import org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.RelatedQueryCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRelatedQueryCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RelatedQueryCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRelatedQueryCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRequestHeaderCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRequestHeaderCB.java
index cd0d76dd3..82d6758d6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRequestHeaderCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.RequestHeaderCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RequestHeaderDbm;
+import org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.RequestHeaderCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRequestHeaderCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RequestHeaderCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRequestHeaderCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRoleTypeCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRoleTypeCB.java
index 662652fe7..7cbb17107 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsRoleTypeCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.RoleTypeCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.RoleTypeDbm;
+import org.codelibs.fess.opensearch.config.cbean.RoleTypeCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.RoleTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRoleTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RoleTypeCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRoleTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsScheduledJobCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsScheduledJobCB.java
index a714f19ac..8e64bc2c0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsScheduledJobCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.ScheduledJobCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ScheduledJobDbm;
+import org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.ScheduledJobCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsScheduledJobCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ScheduledJobCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsScheduledJobCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsThumbnailQueueCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsThumbnailQueueCB.java
index 5a5d1a741..1d84cacd6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsThumbnailQueueCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.ThumbnailQueueCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.ThumbnailQueueDbm;
+import org.codelibs.fess.opensearch.config.cbean.ThumbnailQueueCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.ThumbnailQueueCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsThumbnailQueueCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ThumbnailQueueCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsThumbnailQueueCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsWebAuthenticationCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsWebAuthenticationCB.java
index 4b3baa2bb..f323a0755 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsWebAuthenticationCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.WebAuthenticationCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.WebAuthenticationDbm;
+import org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.WebAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsWebAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.WebAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsWebAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsWebConfigCB.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsWebConfigCB.java
index 90b023345..b70f3c7b1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/bs/BsWebConfigCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.bs;
+package org.codelibs.fess.opensearch.config.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.config.cbean.ca.WebConfigCA;
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.config.bsentity.dbmeta.WebConfigDbm;
+import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.ca.WebConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsWebConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.WebConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsWebConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/AccessTokenCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/AccessTokenCA.java
index 60aae778f..decd099ac 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/AccessTokenCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsAccessTokenCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsAccessTokenCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/BadWordCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/BadWordCA.java
index b31a5d0b5..d83989607 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/BadWordCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsBadWordCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsBadWordCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/BoostDocumentRuleCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/BoostDocumentRuleCA.java
index 6f985a2f3..af2655c3d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/BoostDocumentRuleCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsBoostDocumentRuleCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsBoostDocumentRuleCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/CrawlingInfoCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/CrawlingInfoCA.java
index e75ce6c8a..37ec7abd4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/CrawlingInfoCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsCrawlingInfoCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/CrawlingInfoParamCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/CrawlingInfoParamCA.java
index 62ee5faf3..ede79fed6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/CrawlingInfoParamCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoParamCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsCrawlingInfoParamCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/DataConfigCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/DataConfigCA.java
index e4cd24f00..55e30a945 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/DataConfigCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsDataConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsDataConfigCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/DuplicateHostCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/DuplicateHostCA.java
index 8a77707b7..69fbb2d21 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/DuplicateHostCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsDuplicateHostCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsDuplicateHostCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ElevateWordCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ElevateWordCA.java
index eb3ff5eea..d3dc59131 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ElevateWordCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsElevateWordCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ElevateWordToLabelCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ElevateWordToLabelCA.java
index e7416b03e..1b7c4c46e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ElevateWordToLabelCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordToLabelCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsElevateWordToLabelCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FailureUrlCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FailureUrlCA.java
index 591031ae4..073df8afc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FailureUrlCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsFailureUrlCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsFailureUrlCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FileAuthenticationCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FileAuthenticationCA.java
index a5b823fc4..89ddebcef 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FileAuthenticationCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsFileAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsFileAuthenticationCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FileConfigCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FileConfigCA.java
index 3a63c729c..45b2f1a0f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/FileConfigCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsFileConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsFileConfigCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/JobLogCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/JobLogCA.java
index 21e9c95c5..cf3aa045c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/JobLogCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsJobLogCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsJobLogCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/KeyMatchCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/KeyMatchCA.java
index 83a57c010..f531b9c17 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/KeyMatchCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsKeyMatchCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsKeyMatchCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/LabelTypeCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/LabelTypeCA.java
index 3924b7f70..8cd30f201 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/LabelTypeCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsLabelTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsLabelTypeCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/PathMappingCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/PathMappingCA.java
index 3f72a7bae..3f7a79dac 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/PathMappingCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsPathMappingCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsPathMappingCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RelatedContentCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RelatedContentCA.java
index 8c1de59cf..442c746f7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RelatedContentCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedContentCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRelatedContentCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RelatedQueryCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RelatedQueryCA.java
index 5ebf54586..11168202d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RelatedQueryCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedQueryCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRelatedQueryCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RequestHeaderCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RequestHeaderCA.java
index 7889cf57e..0712e6d12 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RequestHeaderCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsRequestHeaderCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRequestHeaderCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RoleTypeCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RoleTypeCA.java
index e153ed384..62916b899 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/RoleTypeCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsRoleTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsRoleTypeCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ScheduledJobCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ScheduledJobCA.java
index d198060ff..4975db165 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ScheduledJobCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsScheduledJobCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsScheduledJobCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ThumbnailQueueCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ThumbnailQueueCA.java
index 909c79c56..b44ceaffc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/ThumbnailQueueCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsThumbnailQueueCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsThumbnailQueueCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/WebAuthenticationCA.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/WebAuthenticationCA.java
index e076c8e82..013673df3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/WebAuthenticationCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsWebAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsWebAuthenticationCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/WebConfigCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/WebConfigCA.java
index 3ad45b109..c124a3fd0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/WebConfigCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca;
+package org.codelibs.fess.opensearch.config.cbean.ca;
 
-import org.codelibs.fess.es.config.cbean.ca.bs.BsWebConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.ca.bs.BsWebConfigCA;
 
 /**
  * @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/opensearch/config/cbean/ca/bs/BsAccessTokenCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsAccessTokenCA.java
index 23d97bc80..09dad2a49 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.AccessTokenCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.AccessTokenCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsAccessTokenCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsBadWordCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsBadWordCA.java
index 8ad991993..878e1c8fe 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsBadWordCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.BadWordCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.BadWordCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsBadWordCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index 779f6e3a8..548f7c3cf 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.BoostDocumentRuleCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.BoostDocumentRuleCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsCrawlingInfoCA.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsCrawlingInfoCA.java
index add1a1388..3f671be47 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.CrawlingInfoCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.CrawlingInfoCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index ae4e36d78..f91c6f092 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.CrawlingInfoParamCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.CrawlingInfoParamCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsDataConfigCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsDataConfigCA.java
index 6148c5fb4..ed1edf5d1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsDataConfigCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.DataConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.DataConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsDataConfigCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsDuplicateHostCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsDuplicateHostCA.java
index fb0b3106c..7626f84b6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.DuplicateHostCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.DuplicateHostCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsElevateWordCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsElevateWordCA.java
index b0e7caf50..1f15ad76b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsElevateWordCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.ElevateWordCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ElevateWordCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsElevateWordCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsElevateWordToLabelCA.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index d7b38bf00..350db2ab0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.ElevateWordToLabelCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ElevateWordToLabelCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFailureUrlCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFailureUrlCA.java
index 05505ffaf..076667159 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.FailureUrlCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.FailureUrlCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFailureUrlCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFileAuthenticationCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFileAuthenticationCA.java
index 2148648c5..947353d4d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.FileAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.FileAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFileAuthenticationCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFileConfigCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFileConfigCA.java
index 5a4fb6b68..b0e158ae8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsFileConfigCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.FileConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.FileConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFileConfigCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsJobLogCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsJobLogCA.java
index 34e01d05c..49be07be6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsJobLogCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.JobLogCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.JobLogCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsJobLogCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsKeyMatchCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsKeyMatchCA.java
index e67af5ef4..46b0f8a2f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.KeyMatchCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.KeyMatchCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsKeyMatchCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsLabelTypeCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsLabelTypeCA.java
index bf4b4595c..bed7bac98 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.LabelTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.LabelTypeCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsLabelTypeCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsPathMappingCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsPathMappingCA.java
index 5c93f7e6b..42180e593 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsPathMappingCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.PathMappingCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.PathMappingCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsPathMappingCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRelatedContentCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRelatedContentCA.java
index 6ae4bfcc6..973e1503f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.RelatedContentCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RelatedContentCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRelatedContentCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRelatedQueryCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRelatedQueryCA.java
index 36263ccce..65b304518 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.RelatedQueryCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RelatedQueryCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRelatedQueryCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRequestHeaderCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRequestHeaderCA.java
index e895f6c16..7dcf5744d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.RequestHeaderCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RequestHeaderCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRequestHeaderCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRoleTypeCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRoleTypeCA.java
index b06514d43..0b45e44b3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.RoleTypeCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.RoleTypeCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRoleTypeCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsScheduledJobCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsScheduledJobCA.java
index 6d126f8ae..72140eb22 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.ScheduledJobCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ScheduledJobCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsScheduledJobCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsThumbnailQueueCA.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsThumbnailQueueCA.java
index 8b1929588..aa3679f05 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.ThumbnailQueueCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.ThumbnailQueueCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsThumbnailQueueCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsWebAuthenticationCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 91736251e..fe27ce744 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.WebAuthenticationCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.WebAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsWebAuthenticationCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsWebConfigCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsWebConfigCA.java
index 8b158a0be..7376bdefa 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/ca/bs/BsWebConfigCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.ca.bs;
+package org.codelibs.fess.opensearch.config.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.ca.WebConfigCA;
+import org.codelibs.fess.opensearch.config.cbean.cq.WebConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsWebConfigCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/AccessTokenCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/AccessTokenCQ.java
index 6a76a36e0..e83fb4971 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/AccessTokenCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsAccessTokenCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/BadWordCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/BadWordCQ.java
index 8a9904874..2b7200d3e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/BadWordCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsBadWordCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/BoostDocumentRuleCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/BoostDocumentRuleCQ.java
index 89e7da826..4491f3789 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/BoostDocumentRuleCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/CrawlingInfoCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/CrawlingInfoCQ.java
index 031939edc..b980c547e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/CrawlingInfoCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsCrawlingInfoCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/CrawlingInfoParamCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/CrawlingInfoParamCQ.java
index 5808946c1..d746de929 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/CrawlingInfoParamCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/DataConfigCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/DataConfigCQ.java
index b2542ac8b..752d14922 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/DataConfigCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsDataConfigCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/DuplicateHostCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/DuplicateHostCQ.java
index 1a312ea0b..2770c7f46 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/DuplicateHostCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsDuplicateHostCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ElevateWordCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ElevateWordCQ.java
index 7bd6b5bb6..02521c390 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ElevateWordCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsElevateWordCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ElevateWordToLabelCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ElevateWordToLabelCQ.java
index c0df0b8da..5e181dffb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ElevateWordToLabelCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FailureUrlCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FailureUrlCQ.java
index be3388c40..010f8d611 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FailureUrlCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFailureUrlCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FileAuthenticationCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FileAuthenticationCQ.java
index 1a48c141d..575506d9a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FileAuthenticationCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFileAuthenticationCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FileConfigCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FileConfigCQ.java
index f7cbe1906..1a32e2b3f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/FileConfigCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsFileConfigCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/JobLogCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/JobLogCQ.java
index 7b3f5c457..d0c30df20 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/JobLogCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsJobLogCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/KeyMatchCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/KeyMatchCQ.java
index ccf1eff3f..e11c27837 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/KeyMatchCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsKeyMatchCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/LabelTypeCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/LabelTypeCQ.java
index 19faabcc2..22a189c27 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/LabelTypeCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsLabelTypeCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/PathMappingCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/PathMappingCQ.java
index 2a969e3c2..38e8f5c65 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/PathMappingCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsPathMappingCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RelatedContentCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RelatedContentCQ.java
index 3d03288b2..fd26f8cea 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RelatedContentCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRelatedContentCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RelatedQueryCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RelatedQueryCQ.java
index 1d58086ec..69512d708 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RelatedQueryCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRelatedQueryCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RequestHeaderCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RequestHeaderCQ.java
index 28d5fa0ea..03431dcb8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RequestHeaderCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRequestHeaderCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RoleTypeCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RoleTypeCQ.java
index 7735c1e82..9a6dc672d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/RoleTypeCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsRoleTypeCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ScheduledJobCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ScheduledJobCQ.java
index bd17a9bce..56b3bb04c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ScheduledJobCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsScheduledJobCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ThumbnailQueueCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ThumbnailQueueCQ.java
index 1c3836720..51082e1bc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/ThumbnailQueueCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsThumbnailQueueCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/WebAuthenticationCQ.java
similarity index 84%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/WebAuthenticationCQ.java
index 4a8e73eb5..d3fa63f36 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/WebAuthenticationCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsWebAuthenticationCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/WebConfigCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/WebConfigCQ.java
index ea8246177..8270c86ca 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/WebConfigCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq;
+package org.codelibs.fess.opensearch.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
+import org.codelibs.fess.opensearch.config.cbean.cq.bs.BsWebConfigCQ;
 
 /**
  * @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/opensearch/config/cbean/cq/bs/BsAccessTokenCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsAccessTokenCQ.java
index ed4b1d307..85c6fe842 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsAccessTokenCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.AccessTokenCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsBadWordCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsBadWordCQ.java
index adee16820..56d56a781 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsBadWordCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.BadWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index 6c9f41338..08c1fd86a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.BoostDocumentRuleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsCrawlingInfoCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsCrawlingInfoCQ.java
index e10f52f11..5704c2482 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsCrawlingInfoCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.CrawlingInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
index 6c35e9fb1..e331e8141 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.CrawlingInfoParamCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsDataConfigCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsDataConfigCQ.java
index e2c53cde1..5466a7c50 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.DataConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsDuplicateHostCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsDuplicateHostCQ.java
index 8275cf544..84d9d34e6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsDuplicateHostCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.DuplicateHostCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsElevateWordCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsElevateWordCQ.java
index b56831225..654c15ae8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsElevateWordCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.ElevateWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
index be956cecd..c988936d2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.ElevateWordToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFailureUrlCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFailureUrlCQ.java
index 5cb490ce3..66dc67273 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.FailureUrlCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFileAuthenticationCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index c434b2a8e..8b6e79618 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.FileAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFileConfigCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFileConfigCQ.java
index 1ac0d67da..9b1b5d7a0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.FileConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsJobLogCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsJobLogCQ.java
index 2af05f6a6..906bb887b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsJobLogCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.JobLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsKeyMatchCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsKeyMatchCQ.java
index c8c70e076..efb49d191 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.KeyMatchCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsLabelTypeCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsLabelTypeCQ.java
index 34176395e..e795f7a10 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.LabelTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsPathMappingCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsPathMappingCQ.java
index ac328a17e..5e9942733 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.PathMappingCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRelatedContentCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRelatedContentCQ.java
index 982c8afae..ad6ab8064 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRelatedContentCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.RelatedContentCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRelatedQueryCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRelatedQueryCQ.java
index 778938495..b7b910a7f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRelatedQueryCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.RelatedQueryCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRequestHeaderCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRequestHeaderCQ.java
index 7038a561e..4bebc5ea0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.RequestHeaderCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRoleTypeCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRoleTypeCQ.java
index 5d743c336..60e09912f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.RoleTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsScheduledJobCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsScheduledJobCQ.java
index f26a29fda..169002aa2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.ScheduledJobCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsThumbnailQueueCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsThumbnailQueueCQ.java
index 06fa0fef8..f40ff9385 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsThumbnailQueueCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.ThumbnailQueueCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsWebAuthenticationCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index 39890fb31..39b9a9570 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.WebAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsWebConfigCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsWebConfigCQ.java
index f09e50603..d10a6aa0a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.cbean.cq.bs;
+package org.codelibs.fess.opensearch.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
+import org.codelibs.fess.opensearch.config.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.config.cbean.cq.WebConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/AccessTokenBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/AccessTokenBhv.java
index b2225662d..7460d54cf 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/AccessTokenBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsAccessTokenBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsAccessTokenBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/BadWordBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/BadWordBhv.java
index 6d5a5eb4f..e6e8a3433 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/BadWordBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsBadWordBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsBadWordBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/BoostDocumentRuleBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/BoostDocumentRuleBhv.java
index a5a076d90..7ad9de803 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/BoostDocumentRuleBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsBoostDocumentRuleBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsBoostDocumentRuleBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/CrawlingInfoBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/CrawlingInfoBhv.java
index 76ef6bc43..38dd23cf6 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/CrawlingInfoBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsCrawlingInfoBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/CrawlingInfoParamBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/CrawlingInfoParamBhv.java
index c101bc18d..5308d110e 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/CrawlingInfoParamBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoParamBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsCrawlingInfoParamBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/DataConfigBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/DataConfigBhv.java
index d8bd40007..293328469 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/DataConfigBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsDataConfigBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsDataConfigBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/DuplicateHostBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/DuplicateHostBhv.java
index 247b826dc..43ed61487 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/DuplicateHostBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsDuplicateHostBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsDuplicateHostBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ElevateWordBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/ElevateWordBhv.java
index 528716884..aee481f4a 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ElevateWordBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsElevateWordBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsElevateWordBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ElevateWordToLabelBhv.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/ElevateWordToLabelBhv.java
index 2c56e1047..d608d206f 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ElevateWordToLabelBhv.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
-import org.codelibs.fess.es.config.bsbhv.BsElevateWordToLabelBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsElevateWordToLabelBhv;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/FailureUrlBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/FailureUrlBhv.java
index a37911a2c..a4e8a2496 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/FailureUrlBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsFailureUrlBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsFailureUrlBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/FileAuthenticationBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/FileAuthenticationBhv.java
index 974153ff6..5faafc88f 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/FileAuthenticationBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsFileAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsFileAuthenticationBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/FileConfigBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/FileConfigBhv.java
index 8d9370c20..8fb04e38a 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/FileConfigBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsFileConfigBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsFileConfigBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/JobLogBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/JobLogBhv.java
index 01b7e3b35..4b947e4a6 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/JobLogBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsJobLogBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsJobLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/KeyMatchBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/KeyMatchBhv.java
index fe92efb7e..a3a881360 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/KeyMatchBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsKeyMatchBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsKeyMatchBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/LabelTypeBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/LabelTypeBhv.java
index 0fed4f894..336787305 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/LabelTypeBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsLabelTypeBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsLabelTypeBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/PathMappingBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/PathMappingBhv.java
index cd03ba3c9..fbb12bced 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/PathMappingBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsPathMappingBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsPathMappingBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RelatedContentBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/RelatedContentBhv.java
index d50cd2060..cdad89bf3 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RelatedContentBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsRelatedContentBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsRelatedContentBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RelatedQueryBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/RelatedQueryBhv.java
index 9e7b092e0..2c4e3f5f4 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RelatedQueryBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsRelatedQueryBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsRelatedQueryBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RequestHeaderBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/RequestHeaderBhv.java
index df9d1a89e..f4e90dfa2 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RequestHeaderBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsRequestHeaderBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsRequestHeaderBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RoleTypeBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/RoleTypeBhv.java
index 997f8a2f8..617840949 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/RoleTypeBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsRoleTypeBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsRoleTypeBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ScheduledJobBhv.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/ScheduledJobBhv.java
index 19594fcf1..1a41d3ed6 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ScheduledJobBhv.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
@@ -21,8 +21,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.ThreadUtil;
-import org.codelibs.fess.es.config.bsbhv.BsScheduledJobBhv;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.bsbhv.BsScheduledJobBhv;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ThumbnailQueueBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/ThumbnailQueueBhv.java
index 0ddb9235c..76c4c241c 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/ThumbnailQueueBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsThumbnailQueueBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsThumbnailQueueBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/WebAuthenticationBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/WebAuthenticationBhv.java
index dece72545..7e52e3e93 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/WebAuthenticationBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsWebAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsWebAuthenticationBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/WebConfigBhv.java
similarity index 90%
rename from src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exbhv/WebConfigBhv.java
index 1153ba28c..9648c2f48 100644
--- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exbhv/WebConfigBhv.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exbhv;
+package org.codelibs.fess.opensearch.config.exbhv;
 
 import java.util.regex.Pattern;
 
-import org.codelibs.fess.es.config.bsbhv.BsWebConfigBhv;
+import org.codelibs.fess.opensearch.config.bsbhv.BsWebConfigBhv;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/AccessToken.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/AccessToken.java
index 6ca643c9a..4745a79cf 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/AccessToken.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Arrays;
 import java.util.Date;
 
-import org.codelibs.fess.es.config.bsentity.BsAccessToken;
+import org.codelibs.fess.opensearch.config.bsentity.BsAccessToken;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/BadWord.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/BadWord.java
index 0c7a05537..a1b726fe3 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/BadWord.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsBadWord;
+import org.codelibs.fess.opensearch.config.bsentity.BsBadWord;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/BoostDocumentRule.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/BoostDocumentRule.java
index 2e34b3b0a..69d610a5f 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/BoostDocumentRule.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsBoostDocumentRule;
+import org.codelibs.fess.opensearch.config.bsentity.BsBoostDocumentRule;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingConfig.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingConfig.java
index 6da8d3e22..bd3c2a97b 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingConfig.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Map;
 import java.util.function.Supplier;
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingConfigWrapper.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingConfigWrapper.java
index 43bb3a221..ea088d1d9 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingConfigWrapper.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Map;
 import java.util.function.Supplier;
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingInfo.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingInfo.java
index 9d93874de..15be85736 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingInfo.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.List;
 
-import org.codelibs.fess.es.config.bsentity.BsCrawlingInfo;
+import org.codelibs.fess.opensearch.config.bsentity.BsCrawlingInfo;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingInfoParam.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingInfoParam.java
index 08f5efd44..1a98a851f 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/CrawlingInfoParam.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Locale;
 
-import org.codelibs.fess.es.config.bsentity.BsCrawlingInfoParam;
-import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv;
+import org.codelibs.fess.opensearch.config.bsentity.BsCrawlingInfoParam;
+import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/DataConfig.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/DataConfig.java
index 548a61bbe..a4f315d76 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/DataConfig.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,7 +50,7 @@
 import org.codelibs.fess.crawler.client.smb.SmbAuthentication;
 import org.codelibs.fess.crawler.client.smb.SmbClient;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
-import org.codelibs.fess.es.config.bsentity.BsDataConfig;
+import org.codelibs.fess.opensearch.config.bsentity.BsDataConfig;
 import org.codelibs.fess.util.ParameterUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/DuplicateHost.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/DuplicateHost.java
index 9115a6d2f..a4f6fffb3 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/DuplicateHost.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsDuplicateHost;
+import org.codelibs.fess.opensearch.config.bsentity.BsDuplicateHost;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ElevateWord.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/ElevateWord.java
index c0b5c7fa4..18206ef64 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ElevateWord.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,10 +21,10 @@
 import java.util.List;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.config.bsentity.BsElevateWord;
-import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.bsentity.BsElevateWord;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ElevateWordToLabel.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/ElevateWordToLabel.java
index a0141896c..2af95eef3 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ElevateWordToLabel.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsElevateWordToLabel;
+import org.codelibs.fess.opensearch.config.bsentity.BsElevateWordToLabel;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/FailureUrl.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/FailureUrl.java
index 17c11cf7e..7dbd80e00 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/FailureUrl.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsFailureUrl;
+import org.codelibs.fess.opensearch.config.bsentity.BsFailureUrl;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/FileAuthentication.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/FileAuthentication.java
index 02da94f66..b3991cb31 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/FileAuthentication.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.app.service.FileConfigService;
-import org.codelibs.fess.es.config.bsentity.BsFileAuthentication;
+import org.codelibs.fess.opensearch.config.bsentity.BsFileAuthentication;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/FileConfig.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/FileConfig.java
index 976fb8284..09fdcb845 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/FileConfig.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,8 +30,8 @@
 import org.codelibs.fess.crawler.client.CrawlerClientFactory;
 import org.codelibs.fess.crawler.client.ftp.FtpAuthentication;
 import org.codelibs.fess.crawler.client.smb.SmbAuthentication;
-import org.codelibs.fess.es.config.bsentity.BsFileConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.bsentity.BsFileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ParameterUtil;
 
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/JobLog.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/JobLog.java
index 4c773e977..f5f73313a 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/JobLog.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.bsentity.BsJobLog;
+import org.codelibs.fess.opensearch.config.bsentity.BsJobLog;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/KeyMatch.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/KeyMatch.java
index 41fa3ad72..11cb607cc 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/KeyMatch.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsKeyMatch;
+import org.codelibs.fess.opensearch.config.bsentity.BsKeyMatch;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/LabelType.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/LabelType.java
index 751737eab..563ecedff 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/LabelType.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Locale;
 
-import org.codelibs.fess.es.config.bsentity.BsLabelType;
+import org.codelibs.fess.opensearch.config.bsentity.BsLabelType;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/PathMapping.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/PathMapping.java
index 853b42c3d..c4f1b96f0 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/PathMapping.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.function.BiFunction;
 import java.util.regex.Matcher;
@@ -22,8 +22,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.config.bsentity.BsPathMapping;
 import org.codelibs.fess.helper.PathMappingHelper;
+import org.codelibs.fess.opensearch.config.bsentity.BsPathMapping;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RelatedContent.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/RelatedContent.java
index f2497d326..8a4c1ee66 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RelatedContent.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsRelatedContent;
+import org.codelibs.fess.opensearch.config.bsentity.BsRelatedContent;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RelatedQuery.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/RelatedQuery.java
index 623594d1c..d4c63b574 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RelatedQuery.java
@@ -13,11 +13,11 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Arrays;
 
-import org.codelibs.fess.es.config.bsentity.BsRelatedQuery;
+import org.codelibs.fess.opensearch.config.bsentity.BsRelatedQuery;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RequestHeader.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/RequestHeader.java
index 06d18d831..37b49b35e 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RequestHeader.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.app.service.WebConfigService;
-import org.codelibs.fess.es.config.bsentity.BsRequestHeader;
+import org.codelibs.fess.opensearch.config.bsentity.BsRequestHeader;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RoleType.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/RoleType.java
index 305a4a97b..10516ea11 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/RoleType.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsRoleType;
+import org.codelibs.fess.opensearch.config.bsentity.BsRoleType;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ScheduledJob.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/ScheduledJob.java
index fcfee91ae..9e896816b 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ScheduledJob.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.bsentity.BsScheduledJob;
 import org.codelibs.fess.exception.JobNotFoundException;
+import org.codelibs.fess.opensearch.config.bsentity.BsScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.LaScheduledJob;
 import org.lastaflute.job.key.LaJobUnique;
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ThumbnailQueue.java
similarity index 91%
rename from src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/ThumbnailQueue.java
index 0573a489c..dfcf3e8e2 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/ThumbnailQueue.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsThumbnailQueue;
+import org.codelibs.fess.opensearch.config.bsentity.BsThumbnailQueue;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/WebAuthentication.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/WebAuthentication.java
index 242229115..180b25a2f 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/WebAuthentication.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Map;
 import java.util.Properties;
@@ -36,9 +36,9 @@
 import org.codelibs.fess.crawler.client.http.impl.AuthenticationImpl;
 import org.codelibs.fess.crawler.client.http.ntlm.JcifsEngine;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
-import org.codelibs.fess.es.config.bsentity.BsWebAuthentication;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
+import org.codelibs.fess.opensearch.config.bsentity.BsWebAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ParameterUtil;
 
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java b/src/main/java/org/codelibs/fess/opensearch/config/exentity/WebConfig.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
rename to src/main/java/org/codelibs/fess/opensearch/config/exentity/WebConfig.java
index 39486ee3e..42b246132 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
+++ b/src/main/java/org/codelibs/fess/opensearch/config/exentity/WebConfig.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,10 +32,10 @@
 import org.codelibs.fess.crawler.client.CrawlerClientFactory;
 import org.codelibs.fess.crawler.client.http.Authentication;
 import org.codelibs.fess.crawler.client.http.HcHttpClient;
-import org.codelibs.fess.es.config.bsentity.BsWebConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Client;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.bsentity.BsWebConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Client;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.ParameterUtil;
 
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractBehavior.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractBehavior.java
index 5df5a2cb2..82d53c633 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractBehavior.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.DocMeta;
-import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity.DocMeta;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
 import org.dbflute.bhv.AbstractBehaviorWritable;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionAggregation.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionAggregation.java
index 9ffd27f33..29d535ab5 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionAggregation.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionBean.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionBean.java
index 20b6d810d..5c5b8e276 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionBean.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionQuery.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionQuery.java
index a66608bdd..54a81c058 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractConditionQuery.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractEntity.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractEntity.java
index 691af4023..379dbb739 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsAbstractEntity.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsPagingResultBean.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsPagingResultBean.java
index 56020323e..1673ea524 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsPagingResultBean.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import org.apache.lucene.search.TotalHits;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsSqlClause.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java
rename to src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsSqlClause.java
index 43bfef695..c31261f2e 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/allcommon/EsSqlClause.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.log.allcommon;
 
 import org.dbflute.cbean.sqlclause.AbstractSqlClause;
 import org.dbflute.dbway.DBWay;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsClickLogBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsClickLogBhv.java
index 66a8f465b..4464c05aa 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsClickLogBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsbhv;
+package org.codelibs.fess.opensearch.log.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.ClickLogCB;
-import org.codelibs.fess.es.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.ClickLogDbm;
+import org.codelibs.fess.opensearch.log.cbean.ClickLogCB;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsFavoriteLogBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsFavoriteLogBhv.java
index 79ac1efda..ee219a0aa 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsFavoriteLogBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsbhv;
+package org.codelibs.fess.opensearch.log.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.FavoriteLogDbm;
+import org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsSearchLogBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsSearchLogBhv.java
index 9501e128f..a23be97a0 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsSearchLogBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsbhv;
+package org.codelibs.fess.opensearch.log.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.SearchLogCB;
-import org.codelibs.fess.es.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.SearchLogDbm;
+import org.codelibs.fess.opensearch.log.cbean.SearchLogCB;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsUserInfoBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsUserInfoBhv.java
index e75bd4dad..4e1845874 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsbhv/BsUserInfoBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsbhv;
+package org.codelibs.fess.opensearch.log.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.UserInfoCB;
-import org.codelibs.fess.es.log.exentity.UserInfo;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.UserInfoDbm;
+import org.codelibs.fess.opensearch.log.cbean.UserInfoCB;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsClickLog.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsClickLog.java
index 40101db92..6a50646ae 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsClickLog.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity;
+package org.codelibs.fess.opensearch.log.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.ClickLogDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsFavoriteLog.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsFavoriteLog.java
index 047d73a7b..ad9f1cde0 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsFavoriteLog.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity;
+package org.codelibs.fess.opensearch.log.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.FavoriteLogDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsSearchLog.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsSearchLog.java
index 2e42dd7ad..949f670c3 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsSearchLog.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity;
+package org.codelibs.fess.opensearch.log.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.SearchLogDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsUserInfo.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsUserInfo.java
index 9c5a7c5a4..93e9004bb 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/BsUserInfo.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity;
+package org.codelibs.fess.opensearch.log.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.UserInfoDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/ClickLogDbm.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/ClickLogDbm.java
index 3f25e9e22..29bcb6186 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/ClickLogDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.log.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -211,17 +211,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.log.exentity.ClickLog";
+        return "org.codelibs.fess.opensearch.log.exentity.ClickLog";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.log.cbean.ClickLogCB";
+        return "org.codelibs.fess.opensearch.log.cbean.ClickLogCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.log.exbhv.ClickLogBhv";
+        return "org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/FavoriteLogDbm.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/FavoriteLogDbm.java
index 1538a4ea9..a383be010 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/FavoriteLogDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.log.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -187,17 +187,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.log.exentity.FavoriteLog";
+        return "org.codelibs.fess.opensearch.log.exentity.FavoriteLog";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.log.cbean.FavoriteLogCB";
+        return "org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.log.exbhv.FavoriteLogBhv";
+        return "org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/SearchLogDbm.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/SearchLogDbm.java
index 5e8b75851..488403abc 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/SearchLogDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.log.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -311,17 +311,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.log.exentity.SearchLog";
+        return "org.codelibs.fess.opensearch.log.exentity.SearchLog";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.log.cbean.SearchLogCB";
+        return "org.codelibs.fess.opensearch.log.cbean.SearchLogCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.log.exbhv.SearchLogBhv";
+        return "org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/UserInfoDbm.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/UserInfoDbm.java
index 14adc1767..367631438 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/bsentity/dbmeta/UserInfoDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.log.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.log.exentity.UserInfo;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -162,17 +162,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.log.exentity.UserInfo";
+        return "org.codelibs.fess.opensearch.log.exentity.UserInfo";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.log.cbean.UserInfoCB";
+        return "org.codelibs.fess.opensearch.log.cbean.UserInfoCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.log.exbhv.UserInfoBhv";
+        return "org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ClickLogCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ClickLogCB.java
index 67ff2ce90..0129f089d 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ClickLogCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean;
+package org.codelibs.fess.opensearch.log.cbean;
 
-import org.codelibs.fess.es.log.cbean.bs.BsClickLogCB;
+import org.codelibs.fess.opensearch.log.cbean.bs.BsClickLogCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/FavoriteLogCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/FavoriteLogCB.java
index 6c387ddfe..60162ce71 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/FavoriteLogCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean;
+package org.codelibs.fess.opensearch.log.cbean;
 
-import org.codelibs.fess.es.log.cbean.bs.BsFavoriteLogCB;
+import org.codelibs.fess.opensearch.log.cbean.bs.BsFavoriteLogCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/SearchLogCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/SearchLogCB.java
index 17df70ab9..921a96247 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/SearchLogCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean;
+package org.codelibs.fess.opensearch.log.cbean;
 
-import org.codelibs.fess.es.log.cbean.bs.BsSearchLogCB;
+import org.codelibs.fess.opensearch.log.cbean.bs.BsSearchLogCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/UserInfoCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/UserInfoCB.java
index 6aa7718ad..f23626995 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/UserInfoCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean;
+package org.codelibs.fess.opensearch.log.cbean;
 
-import org.codelibs.fess.es.log.cbean.bs.BsUserInfoCB;
+import org.codelibs.fess.opensearch.log.cbean.bs.BsUserInfoCB;
 
 /**
  * @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/opensearch/log/cbean/bs/BsClickLogCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsClickLogCB.java
index d1710615c..89f1a707a 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsClickLogCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.bs;
+package org.codelibs.fess.opensearch.log.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.ca.ClickLogCA;
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.ClickLogDbm;
+import org.codelibs.fess.opensearch.log.cbean.ClickLogCB;
+import org.codelibs.fess.opensearch.log.cbean.ca.ClickLogCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsClickLogCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.ClickLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsClickLogCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsFavoriteLogCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsFavoriteLogCB.java
index b0421fc35..a4cbaa924 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsFavoriteLogCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.bs;
+package org.codelibs.fess.opensearch.log.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.ca.FavoriteLogCA;
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.FavoriteLogDbm;
+import org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB;
+import org.codelibs.fess.opensearch.log.cbean.ca.FavoriteLogCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsFavoriteLogCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.FavoriteLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsFavoriteLogCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsSearchLogCB.java
similarity index 93%
rename from src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsSearchLogCB.java
index 53172b1e3..a89b7a507 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsSearchLogCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.bs;
+package org.codelibs.fess.opensearch.log.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.ca.SearchLogCA;
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.SearchLogDbm;
+import org.codelibs.fess.opensearch.log.cbean.SearchLogCB;
+import org.codelibs.fess.opensearch.log.cbean.ca.SearchLogCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsSearchLogCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.SearchLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsSearchLogCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsUserInfoCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsUserInfoCB.java
index e4b2a71d4..816a93154 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/bs/BsUserInfoCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.bs;
+package org.codelibs.fess.opensearch.log.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.log.cbean.ca.UserInfoCA;
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.log.bsentity.dbmeta.UserInfoDbm;
+import org.codelibs.fess.opensearch.log.cbean.UserInfoCB;
+import org.codelibs.fess.opensearch.log.cbean.ca.UserInfoCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsUserInfoCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.UserInfoCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsUserInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/ClickLogCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/ClickLogCA.java
index 3e50f0212..9fcdb3d21 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/ClickLogCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca;
+package org.codelibs.fess.opensearch.log.cbean.ca;
 
-import org.codelibs.fess.es.log.cbean.ca.bs.BsClickLogCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsClickLogCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/FavoriteLogCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/FavoriteLogCA.java
index 8d7008f39..bc5cdb462 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/FavoriteLogCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca;
+package org.codelibs.fess.opensearch.log.cbean.ca;
 
-import org.codelibs.fess.es.log.cbean.ca.bs.BsFavoriteLogCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsFavoriteLogCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/SearchLogCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/SearchLogCA.java
index 38891af0a..2518d222f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/SearchLogCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca;
+package org.codelibs.fess.opensearch.log.cbean.ca;
 
-import org.codelibs.fess.es.log.cbean.ca.bs.BsSearchLogCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsSearchLogCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/UserInfoCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/UserInfoCA.java
index ae0c00c78..095bdf4f0 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/UserInfoCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca;
+package org.codelibs.fess.opensearch.log.cbean.ca;
 
-import org.codelibs.fess.es.log.cbean.ca.bs.BsUserInfoCA;
+import org.codelibs.fess.opensearch.log.cbean.ca.bs.BsUserInfoCA;
 
 /**
  * @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/opensearch/log/cbean/ca/bs/BsClickLogCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsClickLogCA.java
index 6455e295b..c4f16a61e 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsClickLogCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca.bs;
+package org.codelibs.fess.opensearch.log.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.ca.ClickLogCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.ClickLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsClickLogCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsFavoriteLogCA.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsFavoriteLogCA.java
index 0d6fb42ab..41aa29118 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca.bs;
+package org.codelibs.fess.opensearch.log.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.ca.FavoriteLogCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.FavoriteLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsFavoriteLogCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsSearchLogCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsSearchLogCA.java
index f450bf7dd..5f5ef3717 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsSearchLogCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca.bs;
+package org.codelibs.fess.opensearch.log.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.ca.SearchLogCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.SearchLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsSearchLogCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsUserInfoCA.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsUserInfoCA.java
index bfcdb826a..45156ed54 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/ca/bs/BsUserInfoCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.ca.bs;
+package org.codelibs.fess.opensearch.log.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.ca.UserInfoCA;
+import org.codelibs.fess.opensearch.log.cbean.cq.UserInfoCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsUserInfoCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/ClickLogCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/ClickLogCQ.java
index e811c136f..bc4f7e6ab 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/ClickLogCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq;
+package org.codelibs.fess.opensearch.log.cbean.cq;
 
-import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsClickLogCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/FavoriteLogCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/FavoriteLogCQ.java
index 96e73d251..9f8d403cc 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/FavoriteLogCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq;
+package org.codelibs.fess.opensearch.log.cbean.cq;
 
-import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsFavoriteLogCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/SearchLogCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/SearchLogCQ.java
index 4f7335d7c..3b5c12438 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/SearchLogCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq;
+package org.codelibs.fess.opensearch.log.cbean.cq;
 
-import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsSearchLogCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/UserInfoCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/UserInfoCQ.java
index 6e6c2e122..c3d4d2c2f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/UserInfoCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq;
+package org.codelibs.fess.opensearch.log.cbean.cq;
 
-import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
+import org.codelibs.fess.opensearch.log.cbean.cq.bs.BsUserInfoCQ;
 
 /**
  * @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/opensearch/log/cbean/cq/bs/BsClickLogCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsClickLogCQ.java
index 12a1dcb8b..813b66f1f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsClickLogCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq.bs;
+package org.codelibs.fess.opensearch.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.cq.ClickLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsFavoriteLogCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsFavoriteLogCQ.java
index 8d6d1a93c..048a531f8 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq.bs;
+package org.codelibs.fess.opensearch.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.cq.FavoriteLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsSearchLogCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsSearchLogCQ.java
index 6e56a812f..e45c5efaa 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq.bs;
+package org.codelibs.fess.opensearch.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.cq.SearchLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsUserInfoCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsUserInfoCQ.java
index 0877af1f4..53ff35afc 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.cbean.cq.bs;
+package org.codelibs.fess.opensearch.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
+import org.codelibs.fess.opensearch.log.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.log.cbean.cq.UserInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/ClickLogBhv.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exbhv/ClickLogBhv.java
index 47372f740..c95c07fc4 100644
--- a/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/ClickLogBhv.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exbhv;
+package org.codelibs.fess.opensearch.log.exbhv;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -24,7 +24,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fess.es.log.bsbhv.BsClickLogBhv;
+import org.codelibs.fess.opensearch.log.bsbhv.BsClickLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.util.DfTypeUtil;
 
diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/FavoriteLogBhv.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exbhv/FavoriteLogBhv.java
index c0883a5fc..57596511a 100644
--- a/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/FavoriteLogBhv.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exbhv;
+package org.codelibs.fess.opensearch.log.exbhv;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -24,7 +24,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fess.es.log.bsbhv.BsFavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.bsbhv.BsFavoriteLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.util.DfTypeUtil;
 
diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/SearchLogBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exbhv/SearchLogBhv.java
index a13d50132..dfe6ecfb7 100644
--- a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/SearchLogBhv.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exbhv;
+package org.codelibs.fess.opensearch.log.exbhv;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -27,8 +27,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fess.es.log.bsbhv.BsSearchLogBhv;
-import org.codelibs.fess.es.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.bsbhv.BsSearchLogBhv;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/UserInfoBhv.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exbhv/UserInfoBhv.java
index 5ac349c53..feddc752c 100644
--- a/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exbhv/UserInfoBhv.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exbhv;
+package org.codelibs.fess.opensearch.log.exbhv;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -24,7 +24,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fess.es.log.bsbhv.BsUserInfoBhv;
+import org.codelibs.fess.opensearch.log.bsbhv.BsUserInfoBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.util.DfTypeUtil;
 
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java b/src/main/java/org/codelibs/fess/opensearch/log/exentity/ClickLog.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exentity/ClickLog.java
index 5467584de..2ed9debc9 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exentity/ClickLog.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exentity;
+package org.codelibs.fess.opensearch.log.exentity;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.codelibs.fess.entity.SearchLogEvent;
-import org.codelibs.fess.es.log.bsentity.BsClickLog;
+import org.codelibs.fess.opensearch.log.bsentity.BsClickLog;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java b/src/main/java/org/codelibs/fess/opensearch/log/exentity/FavoriteLog.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exentity/FavoriteLog.java
index fe3b4cbf7..e86029b33 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exentity/FavoriteLog.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exentity;
+package org.codelibs.fess.opensearch.log.exentity;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.codelibs.fess.entity.SearchLogEvent;
-import org.codelibs.fess.es.log.bsentity.BsFavoriteLog;
+import org.codelibs.fess.opensearch.log.bsentity.BsFavoriteLog;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java b/src/main/java/org/codelibs/fess/opensearch/log/exentity/SearchLog.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exentity/SearchLog.java
index d67d47c26..1888fe062 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exentity/SearchLog.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exentity;
+package org.codelibs.fess.opensearch.log.exentity;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -29,8 +29,8 @@
 import org.codelibs.core.misc.Pair;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchLogEvent;
-import org.codelibs.fess.es.log.bsentity.BsSearchLog;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.bsentity.BsSearchLog;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
 
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java b/src/main/java/org/codelibs/fess/opensearch/log/exentity/UserInfo.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java
rename to src/main/java/org/codelibs/fess/opensearch/log/exentity/UserInfo.java
index 2b1d3f150..43b51a455 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java
+++ b/src/main/java/org/codelibs/fess/opensearch/log/exentity/UserInfo.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.exentity;
+package org.codelibs.fess.opensearch.log.exentity;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.codelibs.fess.entity.SearchLogEvent;
-import org.codelibs.fess.es.log.bsentity.BsUserInfo;
+import org.codelibs.fess.opensearch.log.bsentity.BsUserInfo;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/opensearch/query/StoredLtrQueryBuilder.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
rename to src/main/java/org/codelibs/fess/opensearch/query/StoredLtrQueryBuilder.java
index 3507bceb8..bf6ec2a69 100644
--- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
+++ b/src/main/java/org/codelibs/fess/opensearch/query/StoredLtrQueryBuilder.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.query;
+package org.codelibs.fess.opensearch.query;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractBehavior.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractBehavior.java
index dc935bcfa..0648577be 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractBehavior.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta;
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity.DocMeta;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity.RequestOptionCall;
 import org.dbflute.Entity;
 import org.dbflute.bhv.AbstractBehaviorWritable;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionAggregation.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionAggregation.java
index d07c4813c..6fabee50d 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionAggregation.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionBean.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionBean.java
index 9ff5af493..c84ff4846 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionBean.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionQuery.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionQuery.java
index 232d3112d..294fd0b70 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractConditionQuery.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.log.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractEntity.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractEntity.java
index d3a6c5831..b7ef8212a 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsAbstractEntity.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsPagingResultBean.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsPagingResultBean.java
index ae06270d0..2e7923d22 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsPagingResultBean.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import org.apache.lucene.search.TotalHits;
 import org.dbflute.cbean.result.PagingResultBean;
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsSqlClause.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java
rename to src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsSqlClause.java
index 815705b41..376153b4e 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/allcommon/EsSqlClause.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.allcommon;
+package org.codelibs.fess.opensearch.user.allcommon;
 
 import org.dbflute.cbean.sqlclause.AbstractSqlClause;
 import org.dbflute.dbway.DBWay;
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsGroupBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsGroupBhv.java
index aeb89e2a0..1b5508212 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsGroupBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsbhv;
+package org.codelibs.fess.opensearch.user.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.user.cbean.GroupCB;
-import org.codelibs.fess.es.user.exentity.Group;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.GroupDbm;
+import org.codelibs.fess.opensearch.user.cbean.GroupCB;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsRoleBhv.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsRoleBhv.java
index f46db374d..d568bfd01 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsRoleBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsbhv;
+package org.codelibs.fess.opensearch.user.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.user.cbean.RoleCB;
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.RoleDbm;
+import org.codelibs.fess.opensearch.user.cbean.RoleCB;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsUserBhv.java
similarity index 96%
rename from src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsUserBhv.java
index 4c3be1ec4..3e05b0f46 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsbhv/BsUserBhv.java
@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsbhv;
+package org.codelibs.fess.opensearch.user.bsbhv;
 
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.user.cbean.UserCB;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractBehavior;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity.RequestOptionCall;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.UserDbm;
+import org.codelibs.fess.opensearch.user.cbean.UserCB;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsGroup.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsGroup.java
index c32d91fb1..0cab70cbe 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsGroup.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsentity;
+package org.codelibs.fess.opensearch.user.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.GroupDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsRole.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsRole.java
index a76a8e0ce..0362f54b6 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsRole.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsentity;
+package org.codelibs.fess.opensearch.user.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.RoleDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsUser.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsUser.java
index e4e139bc1..0e4c73315 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/BsUser.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsentity;
+package org.codelibs.fess.opensearch.user.bsentity;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractEntity;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.UserDbm;
 
 /**
  * ${table.comment}
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/GroupDbm.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/GroupDbm.java
index b8a2ac71d..f7aa92dbe 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/GroupDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.user.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.exentity.Group;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -160,17 +160,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.user.exentity.Group";
+        return "org.codelibs.fess.opensearch.user.exentity.Group";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.user.cbean.GroupCB";
+        return "org.codelibs.fess.opensearch.user.cbean.GroupCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.user.exbhv.GroupBhv";
+        return "org.codelibs.fess.opensearch.user.exbhv.GroupBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/RoleDbm.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/RoleDbm.java
index 180b85e17..e9c65cf98 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/RoleDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.user.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -152,17 +152,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.user.exentity.Role";
+        return "org.codelibs.fess.opensearch.user.exentity.Role";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.user.cbean.RoleCB";
+        return "org.codelibs.fess.opensearch.user.cbean.RoleCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.user.exbhv.RoleBhv";
+        return "org.codelibs.fess.opensearch.user.exbhv.RoleBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/UserDbm.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
rename to src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/UserDbm.java
index be195b495..0cdce60b0 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/bsentity/dbmeta/UserDbm.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.bsentity.dbmeta;
+package org.codelibs.fess.opensearch.user.bsentity.dbmeta;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -487,17 +487,17 @@ protected UniqueInfo cpui() {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.user.exentity.User";
+        return "org.codelibs.fess.opensearch.user.exentity.User";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.user.cbean.UserCB";
+        return "org.codelibs.fess.opensearch.user.cbean.UserCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.user.exbhv.UserBhv";
+        return "org.codelibs.fess.opensearch.user.exbhv.UserBhv";
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/GroupCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/GroupCB.java
index 430807e60..e4c597032 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/GroupCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean;
+package org.codelibs.fess.opensearch.user.cbean;
 
-import org.codelibs.fess.es.user.cbean.bs.BsGroupCB;
+import org.codelibs.fess.opensearch.user.cbean.bs.BsGroupCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/RoleCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/RoleCB.java
index 46bdc0e0f..01c935c03 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/RoleCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean;
+package org.codelibs.fess.opensearch.user.cbean;
 
-import org.codelibs.fess.es.user.cbean.bs.BsRoleCB;
+import org.codelibs.fess.opensearch.user.cbean.bs.BsRoleCB;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/UserCB.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/UserCB.java
index d2a4712a4..8fd6be340 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/UserCB.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean;
+package org.codelibs.fess.opensearch.user.cbean;
 
-import org.codelibs.fess.es.user.cbean.bs.BsUserCB;
+import org.codelibs.fess.opensearch.user.cbean.bs.BsUserCB;
 
 /**
  * @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/opensearch/user/cbean/bs/BsGroupCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsGroupCB.java
index 8213ce4d1..18ca8e925 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsGroupCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.bs;
+package org.codelibs.fess.opensearch.user.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.user.cbean.ca.GroupCA;
-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.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.GroupDbm;
+import org.codelibs.fess.opensearch.user.cbean.GroupCB;
+import org.codelibs.fess.opensearch.user.cbean.ca.GroupCA;
+import org.codelibs.fess.opensearch.user.cbean.ca.bs.BsGroupCA;
+import org.codelibs.fess.opensearch.user.cbean.cq.GroupCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsGroupCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsRoleCB.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsRoleCB.java
index 3d6a4107f..40ae1ca01 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsRoleCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.bs;
+package org.codelibs.fess.opensearch.user.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.user.cbean.ca.RoleCA;
-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.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.RoleDbm;
+import org.codelibs.fess.opensearch.user.cbean.RoleCB;
+import org.codelibs.fess.opensearch.user.cbean.ca.RoleCA;
+import org.codelibs.fess.opensearch.user.cbean.ca.bs.BsRoleCA;
+import org.codelibs.fess.opensearch.user.cbean.cq.RoleCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsUserCB.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsUserCB.java
index 915c80c09..4ef3d146e 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/bs/BsUserCB.java
@@ -13,19 +13,19 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.bs;
+package org.codelibs.fess.opensearch.user.cbean.bs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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;
-import org.codelibs.fess.es.user.cbean.ca.UserCA;
-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.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionBean;
+import org.codelibs.fess.opensearch.user.bsentity.dbmeta.UserDbm;
+import org.codelibs.fess.opensearch.user.cbean.UserCB;
+import org.codelibs.fess.opensearch.user.cbean.ca.UserCA;
+import org.codelibs.fess.opensearch.user.cbean.ca.bs.BsUserCA;
+import org.codelibs.fess.opensearch.user.cbean.cq.UserCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsUserCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/GroupCA.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/GroupCA.java
index ac9fc3e18..5254eb69e 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/GroupCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.ca;
+package org.codelibs.fess.opensearch.user.cbean.ca;
 
-import org.codelibs.fess.es.user.cbean.ca.bs.BsGroupCA;
+import org.codelibs.fess.opensearch.user.cbean.ca.bs.BsGroupCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/RoleCA.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/RoleCA.java
index 9dc2bea72..f7f36c7b8 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/RoleCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.ca;
+package org.codelibs.fess.opensearch.user.cbean.ca;
 
-import org.codelibs.fess.es.user.cbean.ca.bs.BsRoleCA;
+import org.codelibs.fess.opensearch.user.cbean.ca.bs.BsRoleCA;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/UserCA.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/UserCA.java
index aa9d1b7a4..01ca3381c 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/UserCA.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.ca;
+package org.codelibs.fess.opensearch.user.cbean.ca;
 
-import org.codelibs.fess.es.user.cbean.ca.bs.BsUserCA;
+import org.codelibs.fess.opensearch.user.cbean.ca.bs.BsUserCA;
 
 /**
  * @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/opensearch/user/cbean/ca/bs/BsGroupCA.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsGroupCA.java
index 246dac281..cee2540c0 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsGroupCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.ca.bs;
+package org.codelibs.fess.opensearch.user.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.user.cbean.ca.GroupCA;
+import org.codelibs.fess.opensearch.user.cbean.cq.GroupCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsGroupCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsRoleCA.java
similarity index 95%
rename from src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsRoleCA.java
index 03d896145..f577f7f76 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsRoleCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.ca.bs;
+package org.codelibs.fess.opensearch.user.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.user.cbean.ca.RoleCA;
+import org.codelibs.fess.opensearch.user.cbean.cq.RoleCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsRoleCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsUserCA.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsUserCA.java
index 6dc80b96d..3a7a2bcc9 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/ca/bs/BsUserCA.java
@@ -13,13 +13,13 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.ca.bs;
+package org.codelibs.fess.opensearch.user.cbean.ca.bs;
 
-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.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionAggregation;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.user.cbean.ca.UserCA;
+import org.codelibs.fess.opensearch.user.cbean.cq.UserCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsUserCQ;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/GroupCQ.java
similarity index 85%
rename from src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/GroupCQ.java
index b810a1188..c75f7e877 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/GroupCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.cq;
+package org.codelibs.fess.opensearch.user.cbean.cq;
 
-import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsGroupCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/RoleCQ.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/RoleCQ.java
index 47bc46aa9..72ad24b89 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/RoleCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.cq;
+package org.codelibs.fess.opensearch.user.cbean.cq;
 
-import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsRoleCQ;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/UserCQ.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/UserCQ.java
index 03aeaf5d0..5b65cf437 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/UserCQ.java
@@ -13,9 +13,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.cq;
+package org.codelibs.fess.opensearch.user.cbean.cq;
 
-import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
+import org.codelibs.fess.opensearch.user.cbean.cq.bs.BsUserCQ;
 
 /**
  * @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/opensearch/user/cbean/cq/bs/BsGroupCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsGroupCQ.java
index dc67431a3..37948595c 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsGroupCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.cq.bs;
+package org.codelibs.fess.opensearch.user.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.user.cbean.cq.GroupCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsRoleCQ.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsRoleCQ.java
index 6398dfbd1..a3349f51c 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsRoleCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.cq.bs;
+package org.codelibs.fess.opensearch.user.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.user.cbean.cq.RoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsUserCQ.java
similarity index 99%
rename from src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
rename to src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsUserCQ.java
index 1c354b648..79e52fa72 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/cbean/cq/bs/BsUserCQ.java
@@ -13,14 +13,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.cbean.cq.bs;
+package org.codelibs.fess.opensearch.user.cbean.cq.bs;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.user.cbean.cq.UserCQ;
+import org.codelibs.fess.opensearch.user.allcommon.EsAbstractConditionQuery;
+import org.codelibs.fess.opensearch.user.cbean.cq.UserCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.CommonTermsQueryBuilder;
diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java b/src/main/java/org/codelibs/fess/opensearch/user/exbhv/GroupBhv.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/user/exbhv/GroupBhv.java
index 7489a2417..f75388a4b 100644
--- a/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/exbhv/GroupBhv.java
@@ -13,15 +13,15 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.exbhv;
+package org.codelibs.fess.opensearch.user.exbhv;
 
 import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fess.es.user.bsbhv.BsGroupBhv;
-import org.codelibs.fess.es.user.exentity.Group;
+import org.codelibs.fess.opensearch.user.bsbhv.BsGroupBhv;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java b/src/main/java/org/codelibs/fess/opensearch/user/exbhv/RoleBhv.java
similarity index 92%
rename from src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/user/exbhv/RoleBhv.java
index 8204df501..4624a0aaa 100644
--- a/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/exbhv/RoleBhv.java
@@ -13,15 +13,15 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.exbhv;
+package org.codelibs.fess.opensearch.user.exbhv;
 
 import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fess.es.user.bsbhv.BsRoleBhv;
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.bsbhv.BsRoleBhv;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java b/src/main/java/org/codelibs/fess/opensearch/user/exbhv/UserBhv.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java
rename to src/main/java/org/codelibs/fess/opensearch/user/exbhv/UserBhv.java
index 2392747dc..4cabae39a 100644
--- a/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/exbhv/UserBhv.java
@@ -13,15 +13,15 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.exbhv;
+package org.codelibs.fess.opensearch.user.exbhv;
 
 import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fess.es.user.bsbhv.BsUserBhv;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.bsbhv.BsUserBhv;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/Group.java b/src/main/java/org/codelibs/fess/opensearch/user/exentity/Group.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/user/exentity/Group.java
rename to src/main/java/org/codelibs/fess/opensearch/user/exentity/Group.java
index ece518df6..79d9d475c 100644
--- a/src/main/java/org/codelibs/fess/es/user/exentity/Group.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/exentity/Group.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.exentity;
+package org.codelibs.fess.opensearch.user.exentity;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.bsentity.BsGroup;
+import org.codelibs.fess.opensearch.user.bsentity.BsGroup;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/Role.java b/src/main/java/org/codelibs/fess/opensearch/user/exentity/Role.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/es/user/exentity/Role.java
rename to src/main/java/org/codelibs/fess/opensearch/user/exentity/Role.java
index 076c32302..c6818f6a4 100644
--- a/src/main/java/org/codelibs/fess/es/user/exentity/Role.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/exentity/Role.java
@@ -13,12 +13,12 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.exentity;
+package org.codelibs.fess.opensearch.user.exentity;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.es.user.bsentity.BsRole;
+import org.codelibs.fess.opensearch.user.bsentity.BsRole;
 
 /**
  * @author FreeGen
diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/User.java b/src/main/java/org/codelibs/fess/opensearch/user/exentity/User.java
similarity index 97%
rename from src/main/java/org/codelibs/fess/es/user/exentity/User.java
rename to src/main/java/org/codelibs/fess/opensearch/user/exentity/User.java
index f687cb88a..65267a263 100644
--- a/src/main/java/org/codelibs/fess/es/user/exentity/User.java
+++ b/src/main/java/org/codelibs/fess/opensearch/user/exentity/User.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.user.exentity;
+package org.codelibs.fess.opensearch.user.exentity;
 
 import static org.codelibs.core.stream.StreamUtil.stream;
 
@@ -26,8 +26,8 @@
 
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FessUser;
-import org.codelibs.fess.es.user.bsentity.BsUser;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.bsentity.BsUser;
 import org.codelibs.fess.util.ComponentUtil;
 
 /**
diff --git a/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java b/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java
index 35eb3f145..1cacbf39b 100644
--- a/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java
+++ b/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java
@@ -24,11 +24,11 @@
 import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.SearchRequestParams;
-import org.codelibs.fess.es.client.SearchEngineClient.SearchCondition;
-import org.codelibs.fess.es.client.SearchEngineClient.SearchConditionBuilder;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient.SearchCondition;
+import org.codelibs.fess.opensearch.client.SearchEngineClient.SearchConditionBuilder;
 import org.codelibs.fess.rank.fusion.SearchResult.SearchResultBuilder;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
index 0be0a0063..68eb5bb56 100644
--- a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
@@ -18,8 +18,8 @@
 import java.util.Map;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.query.StoredLtrQueryBuilder;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.query.StoredLtrQueryBuilder;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.search.rescore.QueryRescorerBuilder;
 import org.opensearch.search.rescore.RescorerBuilder;
diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
index ab5903e11..bf279e81a 100644
--- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java
+++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
@@ -22,8 +22,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.action.bulk.BulkRequestBuilder;
 import org.opensearch.action.bulk.BulkResponse;
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index 7f0af543a..e7bb77b7b 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -39,13 +39,13 @@
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.core.misc.Tuple3;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv;
-import org.codelibs.fess.es.config.exentity.ThumbnailQueue;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.exception.JobProcessingException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exbhv.ThumbnailQueueBhv;
+import org.codelibs.fess.opensearch.config.exentity.ThumbnailQueue;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.codelibs.fess.util.ResourceUtil;
diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
index 20805ee18..61686900d 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
@@ -34,12 +34,12 @@
 import org.codelibs.fess.crawler.client.CrawlerClientFactory;
 import org.codelibs.fess.crawler.entity.ResponseData;
 import org.codelibs.fess.crawler.exception.CrawlingAccessException;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
 import org.codelibs.fess.exception.ThumbnailGenerationException;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
 import org.codelibs.fess.thumbnail.ThumbnailGenerator;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
diff --git a/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java
index 8afe9c3fc..546a0ff12 100644
--- a/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java
+++ b/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java
@@ -21,8 +21,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.action.admin.cluster.node.hotthreads.NodesHotThreadsResponse;
 import org.opensearch.common.unit.TimeValue;
diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
index 58149ba31..8e79bb5a0 100644
--- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
+++ b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
@@ -25,7 +25,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.opensearch.common.xcontent.XContentFactory;
diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java
index 6a87dcf59..04e7f21b5 100644
--- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java
@@ -35,7 +35,6 @@
 import org.codelibs.fess.crawler.service.DataService;
 import org.codelibs.fess.dict.DictionaryManager;
 import org.codelibs.fess.ds.DataStoreFactory;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.AccessTokenHelper;
 import org.codelibs.fess.helper.ActivityHelper;
@@ -79,6 +78,7 @@
 import org.codelibs.fess.ldap.LdapManager;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.mylasta.direction.FessProp;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.query.QueryFieldConfig;
 import org.codelibs.fess.query.QueryProcessor;
 import org.codelibs.fess.query.parser.QueryParser;
diff --git a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java
index 0ed3a3f8c..eb80de06c 100644
--- a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java
+++ b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java
@@ -34,10 +34,10 @@
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exentity.FileConfig;
-import org.codelibs.fess.es.config.exentity.LabelType;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.exception.GsaConfigException;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.dbflute.optional.OptionalEntity;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
diff --git a/src/main/java/org/codelibs/fess/util/ParameterUtil.java b/src/main/java/org/codelibs/fess/util/ParameterUtil.java
index 6402f20e2..76e7b95f6 100644
--- a/src/main/java/org/codelibs/fess/util/ParameterUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ParameterUtil.java
@@ -22,7 +22,7 @@
 
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
 import org.lastaflute.core.security.PrimaryCipher;
 
 public class ParameterUtil {
diff --git a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
index d7971403e..e277b0d73 100644
--- a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
+++ b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
@@ -22,7 +22,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.codelibs.fess.es.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.lastaflute.di.exception.IORuntimeException;
 import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.ToXContent;
diff --git a/src/main/resources/crawler/es.xml b/src/main/resources/crawler/es.xml
index bffb11d40..4611e1318 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.es.client.CrawlerEngineClient">
+		class="org.codelibs.fess.opensearch.client.CrawlerEngineClient">
 	</component>
 </components>
diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml
index e67fe45e7..0cb12b97e 100644
--- a/src/main/resources/esclient.xml
+++ b/src/main/resources/esclient.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE components PUBLIC "-//DBFLUTE//DTD LastaDi 1.0//EN"
 	"http://dbflute.org/meta/lastadi10.dtd">
 <components>
-	<component name="searchEngineClient" class="org.codelibs.fess.es.client.SearchEngineClient">
+	<component name="searchEngineClient" class="org.codelibs.fess.opensearch.client.SearchEngineClient">
 		<property name="settings">
 			{"http.cors.enabled":"true",
 			 "http.cors.allow-origin":"*",
diff --git a/src/main/resources/esflute_config.xml b/src/main/resources/esflute_config.xml
index 5638b0388..a60155248 100644
--- a/src/main/resources/esflute_config.xml
+++ b/src/main/resources/esflute_config.xml
@@ -5,33 +5,33 @@
 	<include path="esclient.xml"/>
 
 	<!-- The components of DBFlute Runtime. -->
-	<component name="invokerAssistant" class="org.codelibs.fess.es.common.ImplementedInvokerAssistant"/>
+	<component name="invokerAssistant" class="org.codelibs.fess.opensearch.common.ImplementedInvokerAssistant"/>
 	<component name="behaviorCommandInvoker" class="org.dbflute.bhv.core.BehaviorCommandInvoker"/>
 
 	<!-- The components of Behavior. -->
-	<component name="accessTokenBhv" class="org.codelibs.fess.es.config.exbhv.AccessTokenBhv"/>
-	<component name="badWordBhv" class="org.codelibs.fess.es.config.exbhv.BadWordBhv"/>
-	<component name="boostDocumentRuleBhv" class="org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv"/>
-	<component name="crawlingInfoBhv" class="org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv"/>
-	<component name="crawlingInfoParamBhv" class="org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv"/>
-	<component name="dataConfigBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigBhv"/>
-	<component name="duplicateHostBhv" class="org.codelibs.fess.es.config.exbhv.DuplicateHostBhv"/>
-	<component name="elevateWordToLabelBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv"/>
-	<component name="elevateWordBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordBhv"/>
-	<component name="failureUrlBhv" class="org.codelibs.fess.es.config.exbhv.FailureUrlBhv"/>
-	<component name="fileAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv"/>
-	<component name="fileConfigBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigBhv"/>
-	<component name="jobLogBhv" class="org.codelibs.fess.es.config.exbhv.JobLogBhv"/>
-	<component name="keyMatchBhv" class="org.codelibs.fess.es.config.exbhv.KeyMatchBhv"/>
-	<component name="labelTypeBhv" class="org.codelibs.fess.es.config.exbhv.LabelTypeBhv"/>
-	<component name="pathMappingBhv" class="org.codelibs.fess.es.config.exbhv.PathMappingBhv"/>
-	<component name="relatedContentBhv" class="org.codelibs.fess.es.config.exbhv.RelatedContentBhv"/>
-	<component name="relatedQueryBhv" class="org.codelibs.fess.es.config.exbhv.RelatedQueryBhv"/>
-	<component name="requestHeaderBhv" class="org.codelibs.fess.es.config.exbhv.RequestHeaderBhv"/>
-	<component name="roleTypeBhv" class="org.codelibs.fess.es.config.exbhv.RoleTypeBhv"/>
-	<component name="scheduledJobBhv" class="org.codelibs.fess.es.config.exbhv.ScheduledJobBhv"/>
-	<component name="thumbnailQueueBhv" class="org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv"/>
-	<component name="webAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv"/>
-	<component name="webConfigBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigBhv"/>
+	<component name="accessTokenBhv" class="org.codelibs.fess.opensearch.config.exbhv.AccessTokenBhv"/>
+	<component name="badWordBhv" class="org.codelibs.fess.opensearch.config.exbhv.BadWordBhv"/>
+	<component name="boostDocumentRuleBhv" class="org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv"/>
+	<component name="crawlingInfoBhv" class="org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv"/>
+	<component name="crawlingInfoParamBhv" class="org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoParamBhv"/>
+	<component name="dataConfigBhv" class="org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv"/>
+	<component name="duplicateHostBhv" class="org.codelibs.fess.opensearch.config.exbhv.DuplicateHostBhv"/>
+	<component name="elevateWordToLabelBhv" class="org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv"/>
+	<component name="elevateWordBhv" class="org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv"/>
+	<component name="failureUrlBhv" class="org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv"/>
+	<component name="fileAuthenticationBhv" class="org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv"/>
+	<component name="fileConfigBhv" class="org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv"/>
+	<component name="jobLogBhv" class="org.codelibs.fess.opensearch.config.exbhv.JobLogBhv"/>
+	<component name="keyMatchBhv" class="org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv"/>
+	<component name="labelTypeBhv" class="org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv"/>
+	<component name="pathMappingBhv" class="org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv"/>
+	<component name="relatedContentBhv" class="org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv"/>
+	<component name="relatedQueryBhv" class="org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv"/>
+	<component name="requestHeaderBhv" class="org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv"/>
+	<component name="roleTypeBhv" class="org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv"/>
+	<component name="scheduledJobBhv" class="org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv"/>
+	<component name="thumbnailQueueBhv" class="org.codelibs.fess.opensearch.config.exbhv.ThumbnailQueueBhv"/>
+	<component name="webAuthenticationBhv" class="org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv"/>
+	<component name="webConfigBhv" class="org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv"/>
 
 </components>
diff --git a/src/main/resources/esflute_log.xml b/src/main/resources/esflute_log.xml
index 2637238b8..6333c9bd4 100644
--- a/src/main/resources/esflute_log.xml
+++ b/src/main/resources/esflute_log.xml
@@ -5,12 +5,12 @@
 	<include path="esclient.xml"/>
 
 	<!-- The components of DBFlute Runtime. -->
-	<component name="invokerAssistant" class="org.codelibs.fess.es.common.ImplementedInvokerAssistant"/>
+	<component name="invokerAssistant" class="org.codelibs.fess.opensearch.common.ImplementedInvokerAssistant"/>
 	<component name="behaviorCommandInvoker" class="org.dbflute.bhv.core.BehaviorCommandInvoker"/>
 
 	<!-- The components of Behavior. -->
-	<component name="clickLogBhv" class="org.codelibs.fess.es.log.exbhv.ClickLogBhv"/>
-	<component name="favoriteLogBhv" class="org.codelibs.fess.es.log.exbhv.FavoriteLogBhv"/>
-	<component name="searchLogBhv" class="org.codelibs.fess.es.log.exbhv.SearchLogBhv"/>
-	<component name="userInfoBhv" class="org.codelibs.fess.es.log.exbhv.UserInfoBhv"/>
+	<component name="clickLogBhv" class="org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv"/>
+	<component name="favoriteLogBhv" class="org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv"/>
+	<component name="searchLogBhv" class="org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv"/>
+	<component name="userInfoBhv" class="org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv"/>
 </components>
diff --git a/src/main/resources/esflute_user.xml b/src/main/resources/esflute_user.xml
index 20871b80f..6e9f47b5a 100644
--- a/src/main/resources/esflute_user.xml
+++ b/src/main/resources/esflute_user.xml
@@ -5,11 +5,11 @@
 	<include path="esclient.xml"/>
 
 	<!-- The components of DBFlute Runtime. -->
-	<component name="invokerAssistant" class="org.codelibs.fess.es.common.ImplementedInvokerAssistant"/>
+	<component name="invokerAssistant" class="org.codelibs.fess.opensearch.common.ImplementedInvokerAssistant"/>
 	<component name="behaviorCommandInvoker" class="org.dbflute.bhv.core.BehaviorCommandInvoker"/>
 
 	<!-- The components of Behavior. -->
-	<component name="userBhv" class="org.codelibs.fess.es.user.exbhv.UserBhv"/>
-	<component name="roleBhv" class="org.codelibs.fess.es.user.exbhv.RoleBhv"/>
-	<component name="groupBhv" class="org.codelibs.fess.es.user.exbhv.GroupBhv"/>
+	<component name="userBhv" class="org.codelibs.fess.opensearch.user.exbhv.UserBhv"/>
+	<component name="roleBhv" class="org.codelibs.fess.opensearch.user.exbhv.RoleBhv"/>
+	<component name="groupBhv" class="org.codelibs.fess.opensearch.user.exbhv.GroupBhv"/>
 </components>
diff --git a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
index 2b28b4297..b68ccf63f 100644
--- a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
+++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
@@ -45,9 +45,6 @@
 import org.codelibs.fess.crawler.entity.ResultData;
 import org.codelibs.fess.crawler.exception.ChildUrlsException;
 import org.codelibs.fess.crawler.util.FieldConfigs;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DocumentHelper;
@@ -57,6 +54,9 @@
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.MemoryUtil;
diff --git a/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java b/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java
index 91a262b3c..50b538b40 100644
--- a/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java
+++ b/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java
@@ -21,8 +21,8 @@
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.exception.JobProcessingException;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.script.AbstractScriptEngine;
 import org.codelibs.fess.script.ScriptEngineFactory;
 import org.codelibs.fess.unit.UnitFessTestCase;
diff --git a/src/test/java/org/codelibs/fess/entity/ParamMapTest.java b/src/test/java/org/codelibs/fess/entity/ParamMapTest.java
index 2a54b6a5e..a86fc70da 100644
--- a/src/test/java/org/codelibs/fess/entity/ParamMapTest.java
+++ b/src/test/java/org/codelibs/fess/entity/ParamMapTest.java
@@ -18,7 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codelibs.fess.entity.ParamMap;
 import org.codelibs.fess.unit.UnitFessTestCase;
 
 public class ParamMapTest extends UnitFessTestCase {
diff --git a/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java b/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java
index 8e92e6853..95be663d2 100644
--- a/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java
@@ -25,20 +25,20 @@
 import org.codelibs.fess.app.service.DataConfigService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.service.WebConfigService;
-import org.codelibs.fess.es.config.cbean.DataConfigCB;
-import org.codelibs.fess.es.config.cbean.FailureUrlCB;
-import org.codelibs.fess.es.config.cbean.FileConfigCB;
-import org.codelibs.fess.es.config.cbean.WebConfigCB;
-import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.es.config.exbhv.FailureUrlBhv;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.DataConfig;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
-import org.codelibs.fess.es.config.exentity.FileConfig;
-import org.codelibs.fess.es.config.exentity.WebConfig;
+import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
+import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
+import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.CBCall;
diff --git a/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java b/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java
index e04f8a962..ba3a5ac15 100644
--- a/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java
@@ -17,7 +17,7 @@
 
 import java.util.ArrayList;
 
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.codelibs.fess.unit.UnitFessTestCase;
 
 public class DuplicateHostHelperTest extends UnitFessTestCase {
diff --git a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java
index 1e7efd1d5..a2f53a565 100644
--- a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java
@@ -25,9 +25,9 @@
 import java.util.stream.Collectors;
 
 import org.codelibs.fess.app.service.WebConfigService;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
diff --git a/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java b/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java
index c1d6e66e5..d3b3926fc 100644
--- a/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java
@@ -18,7 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.codelibs.fess.es.config.exentity.PathMapping;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.unit.UnitFessTestCase;
 
 public class PathMappingHelperTest extends UnitFessTestCase {
diff --git a/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java b/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java
index 5b550e051..6659f6c72 100644
--- a/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java
@@ -27,8 +27,8 @@
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.entity.FacetInfo;
 import org.codelibs.fess.entity.FacetQueryView;
-import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
diff --git a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java b/src/test/java/org/codelibs/fess/opensearch/config/exentity/WebConfigTest.java
similarity index 99%
rename from src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java
rename to src/test/java/org/codelibs/fess/opensearch/config/exentity/WebConfigTest.java
index b8757a289..2014067f4 100644
--- a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java
+++ b/src/test/java/org/codelibs/fess/opensearch/config/exentity/WebConfigTest.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.es.config.exentity;
+package org.codelibs.fess.opensearch.config.exentity;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java b/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java
index 11d50be65..b7230f08a 100644
--- a/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java
+++ b/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java
@@ -29,7 +29,6 @@
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.util.DfTypeUtil;
-import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.MatchPhraseQueryBuilder;
 import org.opensearch.index.query.PrefixQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java
index 3aa8ef196..0582a14e3 100644
--- a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java
+++ b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java
@@ -21,8 +21,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.io.ResourceUtil;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.xml.sax.InputSource;