diff --git a/src/main/scala/api/ApiCombinedCommitStatus.scala b/src/main/scala/gitbucket/core/api/ApiCombinedCommitStatus.scala
similarity index 97%
rename from src/main/scala/api/ApiCombinedCommitStatus.scala
rename to src/main/scala/gitbucket/core/api/ApiCombinedCommitStatus.scala
index 898b58a11..6a2ccf8b3 100644
--- a/src/main/scala/api/ApiCombinedCommitStatus.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCombinedCommitStatus.scala
@@ -1,4 +1,4 @@
-package api
+package gitbucket.core.api
 
 import gitbucket.core.model.{Account, CommitState, CommitStatus}
 
diff --git a/src/main/scala/api/ApiComment.scala b/src/main/scala/gitbucket/core/api/ApiComment.scala
similarity index 94%
rename from src/main/scala/api/ApiComment.scala
rename to src/main/scala/gitbucket/core/api/ApiComment.scala
index 7ce23a410..fb6b68899 100644
--- a/src/main/scala/api/ApiComment.scala
+++ b/src/main/scala/gitbucket/core/api/ApiComment.scala
@@ -1,7 +1,9 @@
-package api
+package gitbucket.core.api
+
+import gitbucket.core.model.IssueComment
 
 import java.util.Date
-import gitbucket.core.model.IssueComment
+
 
 /**
  * https://developer.github.com/v3/issues/comments/
diff --git a/src/main/scala/api/ApiCommit.scala b/src/main/scala/gitbucket/core/api/ApiCommit.scala
similarity index 71%
rename from src/main/scala/api/ApiCommit.scala
rename to src/main/scala/gitbucket/core/api/ApiCommit.scala
index 71110cc6d..15b41d421 100644
--- a/src/main/scala/api/ApiCommit.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCommit.scala
@@ -1,12 +1,14 @@
-package api
+package gitbucket.core.api
 
-import java.util.Date
-import org.eclipse.jgit.diff.DiffEntry
 import gitbucket.core.util.JGitUtil
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.RepositoryName
+
+import org.eclipse.jgit.diff.DiffEntry
 import org.eclipse.jgit.api.Git
 
+import java.util.Date
+
 /**
  * https://developer.github.com/v3/repos/commits/
  */
@@ -30,10 +32,15 @@ object ApiCommit{
       id        = commit.id,
       message   = commit.fullMessage,
       timestamp = commit.commitTime,
-      added     = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.ADD)    => x.newPath },
-      removed   = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.DELETE) => x.oldPath },
-      modified  = diffs._1.collect { case x if(x.changeType != DiffEntry.ChangeType.ADD &&
-        x.changeType != DiffEntry.ChangeType.DELETE) => x.newPath },
+      added     = diffs._1.collect {
+        case x if x.changeType == DiffEntry.ChangeType.ADD    => x.newPath
+      },
+      removed   = diffs._1.collect {
+        case x if x.changeType == DiffEntry.ChangeType.DELETE => x.oldPath
+      },
+      modified  = diffs._1.collect {
+        case x if x.changeType != DiffEntry.ChangeType.ADD && x.changeType != DiffEntry.ChangeType.DELETE => x.newPath
+      },
       author    = ApiPersonIdent.author(commit),
       committer = ApiPersonIdent.committer(commit)
     )(repositoryName)
diff --git a/src/main/scala/api/ApiCommitListItem.scala b/src/main/scala/gitbucket/core/api/ApiCommitListItem.scala
similarity index 94%
rename from src/main/scala/api/ApiCommitListItem.scala
rename to src/main/scala/gitbucket/core/api/ApiCommitListItem.scala
index d8f3b332c..a57431f96 100644
--- a/src/main/scala/api/ApiCommitListItem.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCommitListItem.scala
@@ -1,9 +1,9 @@
-package api
+package gitbucket.core.api
 
+import gitbucket.core.api.ApiCommitListItem._
 import gitbucket.core.util.JGitUtil.CommitInfo
-// TODO(tanacasino): Fix package name
 import gitbucket.core.util.RepositoryName
-import ApiCommitListItem._
+
 
 /**
  * https://developer.github.com/v3/repos/commits/
diff --git a/src/main/scala/api/ApiCommitStatus.scala b/src/main/scala/gitbucket/core/api/ApiCommitStatus.scala
similarity index 92%
rename from src/main/scala/api/ApiCommitStatus.scala
rename to src/main/scala/gitbucket/core/api/ApiCommitStatus.scala
index 7508477af..03d8ef653 100644
--- a/src/main/scala/api/ApiCommitStatus.scala
+++ b/src/main/scala/gitbucket/core/api/ApiCommitStatus.scala
@@ -1,9 +1,11 @@
-package api
+package gitbucket.core.api
 
-import java.util.Date
 import gitbucket.core.model.CommitStatus
 import gitbucket.core.util.RepositoryName
 
+import java.util.Date
+
+
 /**
  * https://developer.github.com/v3/repos/statuses/#create-a-status
  * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
@@ -17,10 +19,11 @@ case class ApiCommitStatus(
   id: Int,
   context: String,
   creator: ApiUser
-)(sha: String,repositoryName: RepositoryName) {
+)(sha: String, repositoryName: RepositoryName) {
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}/statuses")
 }
 
+
 object ApiCommitStatus {
   def apply(status: CommitStatus, creator:ApiUser): ApiCommitStatus = ApiCommitStatus(
     created_at = status.registeredDate,
diff --git a/src/main/scala/api/ApiError.scala b/src/main/scala/gitbucket/core/api/ApiError.scala
similarity index 75%
rename from src/main/scala/api/ApiError.scala
rename to src/main/scala/gitbucket/core/api/ApiError.scala
index 8acdba202..95114d1ad 100644
--- a/src/main/scala/api/ApiError.scala
+++ b/src/main/scala/gitbucket/core/api/ApiError.scala
@@ -1,4 +1,4 @@
-package api
+package gitbucket.core.api
 
 case class ApiError(
   message: String,
diff --git a/src/main/scala/api/ApiIssue.scala b/src/main/scala/gitbucket/core/api/ApiIssue.scala
similarity index 95%
rename from src/main/scala/api/ApiIssue.scala
rename to src/main/scala/gitbucket/core/api/ApiIssue.scala
index d50723bd4..7fef81b50 100644
--- a/src/main/scala/api/ApiIssue.scala
+++ b/src/main/scala/gitbucket/core/api/ApiIssue.scala
@@ -1,7 +1,9 @@
-package api
+package gitbucket.core.api
+
+import gitbucket.core.model.Issue
 
 import java.util.Date
-import gitbucket.core.model.Issue
+
 
 /**
  * https://developer.github.com/v3/issues/
diff --git a/src/main/scala/api/ApiPath.scala b/src/main/scala/gitbucket/core/api/ApiPath.scala
similarity index 85%
rename from src/main/scala/api/ApiPath.scala
rename to src/main/scala/gitbucket/core/api/ApiPath.scala
index 1f6701e2b..661ce47c5 100644
--- a/src/main/scala/api/ApiPath.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPath.scala
@@ -1,4 +1,4 @@
-package api
+package gitbucket.core.api
 
 /**
  * path for api url. if set path '/repos/aa/bb' then, expand 'http://server:post/repos/aa/bb' when converted to json.
diff --git a/src/main/scala/api/ApiPersonIdent.scala b/src/main/scala/gitbucket/core/api/ApiPersonIdent.scala
similarity index 94%
rename from src/main/scala/api/ApiPersonIdent.scala
rename to src/main/scala/gitbucket/core/api/ApiPersonIdent.scala
index 393e69b95..3c31e1570 100644
--- a/src/main/scala/api/ApiPersonIdent.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPersonIdent.scala
@@ -1,13 +1,16 @@
-package api
+package gitbucket.core.api
+
+import gitbucket.core.util.JGitUtil.CommitInfo
 
 import java.util.Date
-import gitbucket.core.util.JGitUtil.CommitInfo
+
 
 case class ApiPersonIdent(
   name: String,
   email: String,
   date: Date)
 
+
 object ApiPersonIdent {
   def author(commit: CommitInfo): ApiPersonIdent =
     ApiPersonIdent(
diff --git a/src/main/scala/api/ApiPullRequest.scala b/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
similarity index 98%
rename from src/main/scala/api/ApiPullRequest.scala
rename to src/main/scala/gitbucket/core/api/ApiPullRequest.scala
index a4ddccbb2..757752567 100644
--- a/src/main/scala/api/ApiPullRequest.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPullRequest.scala
@@ -1,7 +1,9 @@
-package api
+package gitbucket.core.api
+
+import gitbucket.core.model.{Issue, PullRequest}
 
 import java.util.Date
-import gitbucket.core.model.{Issue, PullRequest}
+
 
 /**
  * https://developer.github.com/v3/pulls/
diff --git a/src/main/scala/api/ApiRepository.scala b/src/main/scala/gitbucket/core/api/ApiRepository.scala
similarity index 96%
rename from src/main/scala/api/ApiRepository.scala
rename to src/main/scala/gitbucket/core/api/ApiRepository.scala
index 60410b06d..0911882bb 100644
--- a/src/main/scala/api/ApiRepository.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRepository.scala
@@ -1,8 +1,8 @@
-package api
+package gitbucket.core.api
 
-import gitbucket.core.util.JGitUtil.CommitInfo
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.model.{Account, Repository}
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+
 
 // https://developer.github.com/v3/repos/
 case class ApiRepository(
diff --git a/src/main/scala/api/ApiUser.scala b/src/main/scala/gitbucket/core/api/ApiUser.scala
similarity index 97%
rename from src/main/scala/api/ApiUser.scala
rename to src/main/scala/gitbucket/core/api/ApiUser.scala
index 6ccc8af0b..4c0ab3837 100644
--- a/src/main/scala/api/ApiUser.scala
+++ b/src/main/scala/gitbucket/core/api/ApiUser.scala
@@ -1,7 +1,9 @@
-package api
+package gitbucket.core.api
+
+import gitbucket.core.model.Account
 
 import java.util.Date
-import gitbucket.core.model.Account
+
 
 case class ApiUser(
   login: String,
@@ -22,6 +24,7 @@ case class ApiUser(
   // val received_events_url = ApiPath(s"/api/v3/users/${login}/received_events")
 }
 
+
 object ApiUser{
   def apply(user: Account): ApiUser = ApiUser(
     login      = user.fullName,
diff --git a/src/main/scala/api/CreateAComment.scala b/src/main/scala/gitbucket/core/api/CreateAComment.scala
similarity index 82%
rename from src/main/scala/api/CreateAComment.scala
rename to src/main/scala/gitbucket/core/api/CreateAComment.scala
index 138f7050e..f636e8a9f 100644
--- a/src/main/scala/api/CreateAComment.scala
+++ b/src/main/scala/gitbucket/core/api/CreateAComment.scala
@@ -1,4 +1,4 @@
-package api
+package gitbucket.core.api
 
 /**
  * https://developer.github.com/v3/issues/comments/#create-a-comment
diff --git a/src/main/scala/api/CreateAStatus.scala b/src/main/scala/gitbucket/core/api/CreateAStatus.scala
similarity index 97%
rename from src/main/scala/api/CreateAStatus.scala
rename to src/main/scala/gitbucket/core/api/CreateAStatus.scala
index 5e988a6ed..3871999ff 100644
--- a/src/main/scala/api/CreateAStatus.scala
+++ b/src/main/scala/gitbucket/core/api/CreateAStatus.scala
@@ -1,4 +1,4 @@
-package api
+package gitbucket.core.api
 
 import gitbucket.core.model.CommitState
 
diff --git a/src/main/scala/api/JsonFormat.scala b/src/main/scala/gitbucket/core/api/JsonFormat.scala
similarity index 98%
rename from src/main/scala/api/JsonFormat.scala
rename to src/main/scala/gitbucket/core/api/JsonFormat.scala
index 12906f136..bcca2f16a 100644
--- a/src/main/scala/api/JsonFormat.scala
+++ b/src/main/scala/gitbucket/core/api/JsonFormat.scala
@@ -1,13 +1,15 @@
-package api
+package gitbucket.core.api
 
-import org.json4s._
-import org.json4s.jackson.Serialization
-import scala.util.Try
-import org.joda.time.format._
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
+import org.joda.time.format._
+import org.json4s._
+import org.json4s.jackson.Serialization
+
 import java.util.Date
 
+import scala.util.Try
+
 
 object JsonFormat {
   case class Context(baseUrl:String)
@@ -22,6 +24,8 @@ object JsonFormat {
     FieldSerializer[ApiCommitListItem.Parent]() + FieldSerializer[ApiCommitListItem]() + FieldSerializer[ApiCommitListItem.Commit]() +
     FieldSerializer[ApiCommitStatus]() + FieldSerializer[ApiCommit]() + FieldSerializer[ApiCombinedCommitStatus]() +
     FieldSerializer[ApiPullRequest.Commit]()
+
+
   def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>
       (
         {
diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 335d60c1a..29c89f038 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -1,26 +1,23 @@
 package gitbucket.core.controller
 
 import gitbucket.core.account.html
+import gitbucket.core.api._
 import gitbucket.core.helper
 import gitbucket.core.model.GroupMember
-import gitbucket.core.util._
-import gitbucket.core.util.Implicits._
-import gitbucket.core.util.Directory._
-import gitbucket.core.util.ControlUtil._
-import gitbucket.core.util.StringUtil._
-import gitbucket.core.ssh.SshUtil
 import gitbucket.core.service._
-import gitbucket.core.service.WebHookService._
+import gitbucket.core.ssh.SshUtil
+import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.StringUtil._
+import gitbucket.core.util._
+
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import org.scalatra.i18n.Messages
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.lib.{FileMode, Constants}
 import org.eclipse.jgit.dircache.DirCache
-
-
-// TODO(tanacasino): Fix package name
-import api._
+import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.scalatra.i18n.Messages
 
 
 class AccountController extends AccountControllerBase
@@ -28,6 +25,7 @@ class AccountController extends AccountControllerBase
   with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
   with AccessTokenService with WebHookService
 
+
 trait AccountControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
     with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
index a1b732e71..09cdc85e6 100644
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -1,5 +1,6 @@
 package gitbucket.core.controller
 
+import gitbucket.core.api.ApiError
 import gitbucket.core.model.Account
 import gitbucket.core.service.{AccountService, SystemSettingsService}
 import gitbucket.core.util.ControlUtil._
@@ -113,7 +114,7 @@ abstract class ControllerBase extends ScalatraFilter
       org.scalatra.NotFound()
     } else if(request.hasAttribute(Keys.Request.APIv3)){
       contentType = formats("json")
-      org.scalatra.NotFound(api.ApiError("Not Found"))
+      org.scalatra.NotFound(ApiError("Not Found"))
     } else {
       org.scalatra.NotFound(gitbucket.core.html.error("Not Found"))
     }
@@ -123,7 +124,7 @@ abstract class ControllerBase extends ScalatraFilter
       org.scalatra.Unauthorized()
     } else if(request.hasAttribute(Keys.Request.APIv3)){
       contentType = formats("json")
-      org.scalatra.Unauthorized(api.ApiError("Requires authentication"))
+      org.scalatra.Unauthorized(ApiError("Requires authentication"))
     } else {
       if(context.loginAccount.isDefined){
         org.scalatra.Unauthorized(redirect("/"))
diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala
index 3f0df298f..b8cf09c5c 100644
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -1,17 +1,20 @@
 package gitbucket.core.controller
 
-import gitbucket.core.html
+import gitbucket.core.api._
 import gitbucket.core.helper.xml
+import gitbucket.core.html
 import gitbucket.core.model.Account
 import gitbucket.core.service.{RepositoryService, ActivityService, AccountService}
-import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator}
+
 import jp.sf.amateras.scalatra.forms._
-import api._
+
 
 class IndexController extends IndexControllerBase 
   with RepositoryService with ActivityService with AccountService with UsersAuthenticator
 
+
 trait IndexControllerBase extends ControllerBase {
   self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
 
@@ -114,6 +117,6 @@ trait IndexControllerBase extends ControllerBase {
   get("/api/v3/rate_limit"){
     contentType = formats("json")
     // this message is same as github enterprise...
-    org.scalatra.NotFound(api.ApiError("Rate limiting is not enabled."))
+    org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
   }
 }
diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala
index b598452e3..4f9c810f1 100644
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -1,25 +1,20 @@
 package gitbucket.core.controller
 
+import gitbucket.core.api._
 import gitbucket.core.issues.html
 import gitbucket.core.model.Issue
+import gitbucket.core.service.IssuesService._
 import gitbucket.core.service._
-import gitbucket.core.service.WebHookService._
-import gitbucket.core.util._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
+import gitbucket.core.util._
 import gitbucket.core.view
 import gitbucket.core.view.Markdown
+
 import jp.sf.amateras.scalatra.forms._
-
-import IssuesService._
 import org.scalatra.Ok
 
 
-// TODO(tanacasino): Fix package name
-import api._
-
-
-
 class IssuesController extends IssuesControllerBase
   with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService
   with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator with PullRequestService with WebHookIssueCommentService
diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
index edb165a8c..68815f9e4 100644
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -1,12 +1,12 @@
 package gitbucket.core.controller
 
-import gitbucket.core.model.{Account, CommitStatus, CommitState, Repository, PullRequest, Issue}
+import gitbucket.core.api._
+import gitbucket.core.model.{Account, CommitState, Repository, PullRequest, Issue}
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
 import gitbucket.core.service.IssuesService._
 import gitbucket.core.service.PullRequestService._
-import gitbucket.core.service.WebHookService._
 import gitbucket.core.service._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
@@ -18,23 +18,18 @@ import gitbucket.core.view.helpers
 
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.errors.NoMergeBaseException
-import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
-import org.eclipse.jgit.merge.MergeStrategy
-import org.eclipse.jgit.transport.RefSpec
+import org.eclipse.jgit.lib.PersonIdent
 import org.slf4j.LoggerFactory
+
 import scala.collection.JavaConverters._
 
 
-// TODO(tanacasino): Fix package name
-import api._
-
-
 class PullRequestsController extends PullRequestsControllerBase
   with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
   with CommitsService with ActivityService with WebHookPullRequestService with ReferrerAuthenticator with CollaboratorsAuthenticator
   with CommitStatusService with MergeService
 
+
 trait PullRequestsControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
     with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService with ReferrerAuthenticator with CollaboratorsAuthenticator
diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
index 8062f4613..1dca52124 100644
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -1,5 +1,6 @@
 package gitbucket.core.controller
 
+import gitbucket.core.api._
 import gitbucket.core.repo.html
 import gitbucket.core.helper
 import gitbucket.core.service._
@@ -24,9 +25,6 @@ import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk._
 import org.scalatra._
 
-// TODO(tanacasino) Fix package name
-import api._
-
 
 class RepositoryViewerController extends RepositoryViewerControllerBase
   with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala
index cba641d41..2e8f786a4 100644
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -1,33 +1,18 @@
 package gitbucket.core.service
 
-import gitbucket.core.model.{WebHook, Account, Issue, PullRequest, IssueComment, Repository}
+import gitbucket.core.api._
+import gitbucket.core.model.{WebHook, Account, Issue, PullRequest, IssueComment}
 import gitbucket.core.model.Profile._
 import profile.simple._
-
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.JGitUtil
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.RepositoryName
-
-import org.slf4j.LoggerFactory
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 
-
-
-import org.slf4j.LoggerFactory
-import RepositoryService.RepositoryInfo
-import org.eclipse.jgit.diff.DiffEntry
-import JGitUtil.CommitInfo
-
-
-import org.eclipse.jgit.api.Git
-import org.apache.http.message.BasicNameValuePair
-import org.apache.http.client.entity.UrlEncodedFormEntity
 import org.apache.http.NameValuePair
-import java.util.Date
-
-// TODO(tanacasino): Fix package name
-import api._
+import org.apache.http.client.entity.UrlEncodedFormEntity
+import org.apache.http.message.BasicNameValuePair
+import org.eclipse.jgit.api.Git
+import org.slf4j.LoggerFactory
 
 
 trait WebHookService {
diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
index 0f490b3e8..88b812415 100644
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -1,8 +1,16 @@
 package gitbucket.core.servlet
 
+import gitbucket.core.api
 import gitbucket.core.model.Session
+import gitbucket.core.service.IssuesService.IssueSearchCondition
+import gitbucket.core.service.WebHookService._
 import gitbucket.core.service._
+import gitbucket.core.util.ControlUtil._
+import gitbucket.core.util.Implicits._
+import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util._
+
+import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.http.server.GitServlet
 import org.eclipse.jgit.lib._
 import org.eclipse.jgit.transport._
@@ -12,13 +20,7 @@ import org.slf4j.LoggerFactory
 import javax.servlet.ServletConfig
 import javax.servlet.ServletContext
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
-import gitbucket.core.util.StringUtil
-import gitbucket.core.util.ControlUtil._
-import gitbucket.core.util.Implicits._
-import WebHookService._
-import org.eclipse.jgit.api.Git
-import JGitUtil.CommitInfo
-import IssuesService.IssueSearchCondition
+
 
 /**
  * Provides Git repository via HTTP.
diff --git a/src/main/scala/gitbucket/core/util/Implicits.scala b/src/main/scala/gitbucket/core/util/Implicits.scala
index d56424b17..b9a6547a2 100644
--- a/src/main/scala/gitbucket/core/util/Implicits.scala
+++ b/src/main/scala/gitbucket/core/util/Implicits.scala
@@ -1,5 +1,6 @@
 package gitbucket.core.util
 
+import gitbucket.core.api.JsonFormat
 import gitbucket.core.controller.Context
 import gitbucket.core.servlet.Database
 
@@ -19,7 +20,7 @@ object Implicits {
   // Convert to slick session.
   implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session = Database.getSession(request)
 
-  implicit def context2ApiJsonFormatContext(implicit context: Context): api.JsonFormat.Context = api.JsonFormat.Context(context.baseUrl)
+  implicit def context2ApiJsonFormatContext(implicit context: Context): JsonFormat.Context = JsonFormat.Context(context.baseUrl)
 
   implicit class RichSeq[A](seq: Seq[A]) {