diff --git a/src/main/java/run/halo/app/config/SwaggerConfiguration.java b/src/main/java/run/halo/app/config/SwaggerConfiguration.java
index 080bbd26a..bf14acd36 100644
--- a/src/main/java/run/halo/app/config/SwaggerConfiguration.java
+++ b/src/main/java/run/halo/app/config/SwaggerConfiguration.java
@@ -64,7 +64,7 @@ public class SwaggerConfiguration {
         log.debug("Doc disabled: [{}]", haloProperties.isDocDisabled());
         // TODO Build with different security configuration
         return buildApiDocket("run.halo.app.content.api",
-                "run.halo.app.web.controller.content.api",
+                "run.halo.app.controller.content.api",
                 "/api/**")
                 .enable(!haloProperties.isDocDisabled());
     }
@@ -74,7 +74,7 @@ public class SwaggerConfiguration {
         log.debug("Doc disabled: [{}]", haloProperties.isDocDisabled());
         // TODO Build with different security configuration
         return buildApiDocket("run.halo.app.admin",
-                "run.halo.app.web.controller.admin",
+                "run.halo.app.controller.admin",
                 "/api/admin/**")
                 .enable(!haloProperties.isDocDisabled());
     }
diff --git a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
index fa9895b2a..40f2f9408 100644
--- a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
+++ b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java
@@ -23,7 +23,7 @@ import run.halo.app.config.properties.HaloProperties;
 import run.halo.app.factory.StringToEnumConverterFactory;
 import run.halo.app.model.support.HaloConst;
 import run.halo.app.security.resolver.AuthenticationArgumentResolver;
-import run.halo.app.web.controller.support.PageJacksonSerializer;
+import run.halo.app.controller.support.PageJacksonSerializer;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ import java.util.List;
 @Slf4j
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = "run.halo.app.web.controller")
+@ComponentScan(basePackages = "run.halo.app.controller")
 @PropertySource(value = "classpath:application.yaml", ignoreResourceNotFound = true, encoding = "UTF-8")
 public class WebMvcAutoConfiguration implements WebMvcConfigurer {
 
diff --git a/src/main/java/run/halo/app/web/controller/admin/MainController.java b/src/main/java/run/halo/app/controller/admin/MainController.java
similarity index 88%
rename from src/main/java/run/halo/app/web/controller/admin/MainController.java
rename to src/main/java/run/halo/app/controller/admin/MainController.java
index feef21547..d87ad6f4e 100644
--- a/src/main/java/run/halo/app/web/controller/admin/MainController.java
+++ b/src/main/java/run/halo/app/controller/admin/MainController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin;
+package run.halo.app.controller.admin;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/controller/admin/api/AdminController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/admin/api/AdminController.java
rename to src/main/java/run/halo/app/controller/admin/api/AdminController.java
index c4ba2914a..d0f97c64a 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/AdminController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java b/src/main/java/run/halo/app/controller/admin/api/AttachmentController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java
rename to src/main/java/run/halo/app/controller/admin/api/AttachmentController.java
index a3356843b..17efea70f 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/AttachmentController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java b/src/main/java/run/halo/app/controller/admin/api/CategoryController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java
rename to src/main/java/run/halo/app/controller/admin/api/CategoryController.java
index d221174b9..f58c44a3f 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/CategoryController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Sort;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java b/src/main/java/run/halo/app/controller/admin/api/CommentController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/admin/api/CommentController.java
rename to src/main/java/run/halo/app/controller/admin/api/CommentController.java
index b110847f6..2fda240e9 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/CommentController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java b/src/main/java/run/halo/app/controller/admin/api/GalleryController.java
similarity index 97%
rename from src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java
rename to src/main/java/run/halo/app/controller/admin/api/GalleryController.java
index e995fac52..deab3fdfc 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/GalleryController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.GalleryDTO;
 import run.halo.app.service.GalleryService;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/controller/admin/api/LinkController.java
similarity index 97%
rename from src/main/java/run/halo/app/web/controller/admin/api/LinkController.java
rename to src/main/java/run/halo/app/controller/admin/api/LinkController.java
index 064a6182c..606a13fe0 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/LinkController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Sort;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/LogController.java b/src/main/java/run/halo/app/controller/admin/api/LogController.java
similarity index 96%
rename from src/main/java/run/halo/app/web/controller/admin/api/LogController.java
rename to src/main/java/run/halo/app/controller/admin/api/LogController.java
index e9a43c298..03af46f96 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/LogController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/LogController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.LogDTO;
 import run.halo.app.service.LogService;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java b/src/main/java/run/halo/app/controller/admin/api/MenuController.java
similarity index 97%
rename from src/main/java/run/halo/app/web/controller/admin/api/MenuController.java
rename to src/main/java/run/halo/app/controller/admin/api/MenuController.java
index f11c64447..8acf79f70 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/MenuController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Sort;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java b/src/main/java/run/halo/app/controller/admin/api/OptionController.java
similarity index 96%
rename from src/main/java/run/halo/app/web/controller/admin/api/OptionController.java
rename to src/main/java/run/halo/app/controller/admin/api/OptionController.java
index 58f8d9fda..4c084e792 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/OptionController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.OptionDTO;
 import run.halo.app.model.params.OptionParam;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/PostController.java b/src/main/java/run/halo/app/controller/admin/api/PostController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/admin/api/PostController.java
rename to src/main/java/run/halo/app/controller/admin/api/PostController.java
index 91ce0800e..1141a3918 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/PostController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/PostController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/TagController.java b/src/main/java/run/halo/app/controller/admin/api/TagController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/admin/api/TagController.java
rename to src/main/java/run/halo/app/controller/admin/api/TagController.java
index 1edf5f111..01c2a6952 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/TagController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/TagController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.TagDTO;
 import run.halo.app.model.entity.Tag;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java b/src/main/java/run/halo/app/controller/admin/api/ThemeController.java
similarity index 99%
rename from src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
rename to src/main/java/run/halo/app/controller/admin/api/ThemeController.java
index b4fb13bf0..9fd6ff1fb 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/ThemeController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/UserController.java b/src/main/java/run/halo/app/controller/admin/api/UserController.java
similarity index 96%
rename from src/main/java/run/halo/app/web/controller/admin/api/UserController.java
rename to src/main/java/run/halo/app/controller/admin/api/UserController.java
index 0184560b8..7e849029f 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/UserController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/UserController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.UserDTO;
 import run.halo.app.model.entity.User;
diff --git a/src/main/java/run/halo/app/web/controller/base/CommonResultControllerAdvice.java b/src/main/java/run/halo/app/controller/base/CommonResultControllerAdvice.java
similarity index 97%
rename from src/main/java/run/halo/app/web/controller/base/CommonResultControllerAdvice.java
rename to src/main/java/run/halo/app/controller/base/CommonResultControllerAdvice.java
index 8f4d020f6..427de66ab 100644
--- a/src/main/java/run/halo/app/web/controller/base/CommonResultControllerAdvice.java
+++ b/src/main/java/run/halo/app/controller/base/CommonResultControllerAdvice.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.base;
+package run.halo.app.controller.base;
 
 import run.halo.app.model.support.BaseResponse;
 import org.springframework.core.MethodParameter;
@@ -20,7 +20,7 @@ import run.halo.app.model.support.BaseResponse;
  *
  * @author johnniang
  */
-@ControllerAdvice("run.halo.app.web.controller")
+@ControllerAdvice("run.halo.app.controller")
 public class CommonResultControllerAdvice implements ResponseBodyAdvice<Object> {
 
     @Override
diff --git a/src/main/java/run/halo/app/web/controller/base/ControllerExceptionHandler.java b/src/main/java/run/halo/app/controller/base/ControllerExceptionHandler.java
similarity index 99%
rename from src/main/java/run/halo/app/web/controller/base/ControllerExceptionHandler.java
rename to src/main/java/run/halo/app/controller/base/ControllerExceptionHandler.java
index 41023fdff..7a62e4293 100644
--- a/src/main/java/run/halo/app/web/controller/base/ControllerExceptionHandler.java
+++ b/src/main/java/run/halo/app/controller/base/ControllerExceptionHandler.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.base;
+package run.halo.app.controller.base;
 
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import run.halo.app.exception.HaloException;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentArchiveController.java b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java
similarity index 99%
rename from src/main/java/run/halo/app/web/controller/content/ContentArchiveController.java
rename to src/main/java/run/halo/app/controller/content/ContentArchiveController.java
index 6029a2146..53341c87c 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentArchiveController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentCategoryController.java b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/content/ContentCategoryController.java
rename to src/main/java/run/halo/app/controller/content/ContentCategoryController.java
index 8003918f7..4fb8a5497 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentCategoryController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentFeedController.java b/src/main/java/run/halo/app/controller/content/ContentFeedController.java
similarity index 99%
rename from src/main/java/run/halo/app/web/controller/content/ContentFeedController.java
rename to src/main/java/run/halo/app/controller/content/ContentFeedController.java
index 9b3d6caaa..38b026822 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentFeedController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentFeedController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentIndexController.java b/src/main/java/run/halo/app/controller/content/ContentIndexController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/content/ContentIndexController.java
rename to src/main/java/run/halo/app/controller/content/ContentIndexController.java
index 3c91545a0..dc80547a3 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentIndexController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentIndexController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentSearchController.java b/src/main/java/run/halo/app/controller/content/ContentSearchController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/content/ContentSearchController.java
rename to src/main/java/run/halo/app/controller/content/ContentSearchController.java
index 6c5b7a444..32f91bd12 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentSearchController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentSearchController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/content/ContentSheetController.java
rename to src/main/java/run/halo/app/controller/content/ContentSheetController.java
index 398f9d899..579eec1e3 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentSheetController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/src/main/java/run/halo/app/web/controller/content/ContentTagController.java b/src/main/java/run/halo/app/controller/content/ContentTagController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/content/ContentTagController.java
rename to src/main/java/run/halo/app/controller/content/ContentTagController.java
index 3899790f0..0399b92d3 100644
--- a/src/main/java/run/halo/app/web/controller/content/ContentTagController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentTagController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/ArchiveController.java b/src/main/java/run/halo/app/controller/content/api/ArchiveController.java
similarity index 95%
rename from src/main/java/run/halo/app/web/controller/content/api/ArchiveController.java
rename to src/main/java/run/halo/app/controller/content/api/ArchiveController.java
index cc29463fe..264598639 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/ArchiveController.java
+++ b/src/main/java/run/halo/app/controller/content/api/ArchiveController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.vo.ArchiveMonthVO;
 import run.halo.app.model.vo.ArchiveYearVO;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/CommentController.java b/src/main/java/run/halo/app/controller/content/api/CommentController.java
similarity index 95%
rename from src/main/java/run/halo/app/web/controller/content/api/CommentController.java
rename to src/main/java/run/halo/app/controller/content/api/CommentController.java
index f9d841188..8b44dd657 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/CommentController.java
+++ b/src/main/java/run/halo/app/controller/content/api/CommentController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/LinkController.java b/src/main/java/run/halo/app/controller/content/api/LinkController.java
similarity index 94%
rename from src/main/java/run/halo/app/web/controller/content/api/LinkController.java
rename to src/main/java/run/halo/app/controller/content/api/LinkController.java
index f949c1028..e8ba1c072 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/LinkController.java
+++ b/src/main/java/run/halo/app/controller/content/api/LinkController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.vo.LinkTeamVO;
 import run.halo.app.service.LinkService;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/MenuController.java b/src/main/java/run/halo/app/controller/content/api/MenuController.java
similarity index 95%
rename from src/main/java/run/halo/app/web/controller/content/api/MenuController.java
rename to src/main/java/run/halo/app/controller/content/api/MenuController.java
index 6ab4a9b8f..dff456f9a 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/MenuController.java
+++ b/src/main/java/run/halo/app/controller/content/api/MenuController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.MenuDTO;
 import run.halo.app.service.MenuService;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/OptionController.java b/src/main/java/run/halo/app/controller/content/api/OptionController.java
similarity index 96%
rename from src/main/java/run/halo/app/web/controller/content/api/OptionController.java
rename to src/main/java/run/halo/app/controller/content/api/OptionController.java
index 8bb78052f..ee8c53053 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/OptionController.java
+++ b/src/main/java/run/halo/app/controller/content/api/OptionController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.OptionDTO;
 import run.halo.app.model.support.BaseResponse;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/PostController.java b/src/main/java/run/halo/app/controller/content/api/PostController.java
similarity index 98%
rename from src/main/java/run/halo/app/web/controller/content/api/PostController.java
rename to src/main/java/run/halo/app/controller/content/api/PostController.java
index 03a6bda9a..2d0b330a2 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/PostController.java
+++ b/src/main/java/run/halo/app/controller/content/api/PostController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.post.PostDetailOutputDTO;
 import run.halo.app.model.dto.post.PostSimpleOutputDTO;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/TagController.java b/src/main/java/run/halo/app/controller/content/api/TagController.java
similarity index 97%
rename from src/main/java/run/halo/app/web/controller/content/api/TagController.java
rename to src/main/java/run/halo/app/controller/content/api/TagController.java
index 73ebaf1d4..fe4db9ecf 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/TagController.java
+++ b/src/main/java/run/halo/app/controller/content/api/TagController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.TagDTO;
 import run.halo.app.model.dto.post.PostSimpleOutputDTO;
diff --git a/src/main/java/run/halo/app/web/controller/content/api/UserController.java b/src/main/java/run/halo/app/controller/content/api/UserController.java
similarity index 94%
rename from src/main/java/run/halo/app/web/controller/content/api/UserController.java
rename to src/main/java/run/halo/app/controller/content/api/UserController.java
index 665cbe3f3..a51b478a9 100644
--- a/src/main/java/run/halo/app/web/controller/content/api/UserController.java
+++ b/src/main/java/run/halo/app/controller/content/api/UserController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.UserDTO;
 import run.halo.app.service.UserService;
diff --git a/src/main/java/run/halo/app/web/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java
similarity index 99%
rename from src/main/java/run/halo/app/web/controller/core/CommonController.java
rename to src/main/java/run/halo/app/controller/core/CommonController.java
index 1fd3a80e7..43d6729fe 100644
--- a/src/main/java/run/halo/app/web/controller/core/CommonController.java
+++ b/src/main/java/run/halo/app/controller/core/CommonController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.core;
+package run.halo.app.controller.core;
 
 import cn.hutool.core.text.StrBuilder;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/run/halo/app/web/controller/core/InstallController.java b/src/main/java/run/halo/app/controller/core/InstallController.java
similarity index 99%
rename from src/main/java/run/halo/app/web/controller/core/InstallController.java
rename to src/main/java/run/halo/app/controller/core/InstallController.java
index cccfe23ab..70f09f36e 100644
--- a/src/main/java/run/halo/app/web/controller/core/InstallController.java
+++ b/src/main/java/run/halo/app/controller/core/InstallController.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.core;
+package run.halo.app.controller.core;
 
 import cn.hutool.core.util.StrUtil;
 import freemarker.template.Configuration;
diff --git a/src/main/java/run/halo/app/web/controller/support/PageJacksonSerializer.java b/src/main/java/run/halo/app/controller/support/PageJacksonSerializer.java
similarity index 97%
rename from src/main/java/run/halo/app/web/controller/support/PageJacksonSerializer.java
rename to src/main/java/run/halo/app/controller/support/PageJacksonSerializer.java
index f7da467a4..764e60bc3 100644
--- a/src/main/java/run/halo/app/web/controller/support/PageJacksonSerializer.java
+++ b/src/main/java/run/halo/app/controller/support/PageJacksonSerializer.java
@@ -1,4 +1,4 @@
-package run.halo.app.web.controller.support;
+package run.halo.app.controller.support;
 
 import run.halo.app.model.support.CommentPage;
 import com.fasterxml.jackson.core.JsonGenerator;