diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala
index 534db751b..231da6545 100644
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -35,19 +35,19 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
     context.mount(new FileUploadController, "/upload")
 
     val filter = new CompositeScalatraFilter()
-    filter.mount(new IndexController)
-    filter.mount(new ApiController)
-    filter.mount(new SystemSettingsController)
-    filter.mount(new DashboardController)
-    filter.mount(new AccountController)
-    filter.mount(new RepositoryViewerController)
-    filter.mount(new WikiController)
-    filter.mount(new LabelsController)
-    filter.mount(new PrioritiesController)
-    filter.mount(new MilestonesController)
-    filter.mount(new IssuesController)
-    filter.mount(new PullRequestsController)
-    filter.mount(new RepositorySettingsController)
+    filter.mount(new IndexController, "/")
+    filter.mount(new ApiController, "/api/v3")
+    filter.mount(new SystemSettingsController, "/admin")
+    filter.mount(new DashboardController, "/*")
+    filter.mount(new AccountController, "/*")
+    filter.mount(new RepositoryViewerController, "/*")
+    filter.mount(new WikiController, "/*")
+    filter.mount(new LabelsController, "/*")
+    filter.mount(new PrioritiesController, "/*")
+    filter.mount(new MilestonesController, "/*")
+    filter.mount(new IssuesController, "/*")
+    filter.mount(new PullRequestsController, "/*")
+    filter.mount(new RepositorySettingsController, "/*")
 
     context.addFilter("compositeScalatraFilter", filter)
     context.getFilterRegistration("compositeScalatraFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
diff --git a/src/main/scala/gitbucket/core/controller/CompositeScalatraFilter.scala b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
similarity index 66%
rename from src/main/scala/gitbucket/core/controller/CompositeScalatraFilter.scala
rename to src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
index d422955a4..5b3ed8a8d 100644
--- a/src/main/scala/gitbucket/core/controller/CompositeScalatraFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala
@@ -1,4 +1,4 @@
-package gitbucket.core.controller
+package gitbucket.core.servlet
 
 import javax.servlet._
 
@@ -8,22 +8,26 @@ import scala.collection.mutable.ListBuffer
 
 class CompositeScalatraFilter extends Filter {
 
-  private val filters = new ListBuffer[ScalatraFilter]()
+  private val filters = new ListBuffer[(ScalatraFilter, String)]()
 
-  def mount(filter: ScalatraFilter): Unit = {
-    filters += filter
+  def mount(filter: ScalatraFilter, path: String): Unit = {
+    filters += ((filter, path))
   }
 
   override def init(filterConfig: FilterConfig): Unit = {
-    filters.foreach(_.init(filterConfig))
+    filters.foreach { case (filter, _) =>
+      filter.init(filterConfig)
+    }
   }
 
   override def destroy(): Unit = {
-    filters.foreach(_.destroy())
+    filters.foreach { case (filter, _) =>
+      filter.destroy()
+    }
   }
 
   override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = {
-    filters.foreach { filter =>
+    filters.foreach { case (filter, path) =>
       val mockChain = new MockFilterChain()
       filter.doFilter(request, response, mockChain)
       if(mockChain.continue == false){
diff --git a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
index 21a8c7855..f51fc5a5a 100644
--- a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
@@ -3,7 +3,6 @@ package gitbucket.core.servlet
 import javax.servlet._
 import javax.servlet.http.HttpServletRequest
 
-import gitbucket.core.controller.MockFilterChain
 import gitbucket.core.plugin.PluginRegistry
 
 class PluginControllerFilter extends Filter {