diff --git a/plugins/github/resources/META-INF/plugin.xml b/plugins/github/resources/META-INF/plugin.xml
index 086dbfc46e08..12c5b47e8b85 100644
--- a/plugins/github/resources/META-INF/plugin.xml
+++ b/plugins/github/resources/META-INF/plugin.xml
@@ -35,7 +35,7 @@
                     serviceImplementation="org.jetbrains.plugins.github.util.GithubProjectSettings"/>
     <projectService serviceImplementation="org.jetbrains.plugins.github.authentication.accounts.GithubProjectDefaultAccountHolder"/>
     <projectService serviceImplementation="org.jetbrains.plugins.github.pullrequest.GithubPullRequestsToolWindowManager"/>
-    <projectService serviceImplementation="org.jetbrains.plugins.github.pullrequest.ui.GithubPullRequestsComponentFactory"/>
+    <projectService serviceImplementation="org.jetbrains.plugins.github.pullrequest.GithubPullRequestsComponentFactory"/>
     <vcsAnnotationGutterActionProvider implementation="org.jetbrains.plugins.github.extensions.GithubAnnotationGutterActionProvider"/>
     <projectConfigurable parentId="project.propVCSSupport.Mappings" instance="org.jetbrains.plugins.github.ui.GithubSettingsConfigurable"/>
     <statistics.applicationUsagesCollector
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsComponentFactory.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsComponentFactory.kt
similarity index 90%
rename from plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsComponentFactory.kt
rename to plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsComponentFactory.kt
index aeb0decade36..3a2b60e73cde 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsComponentFactory.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsComponentFactory.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.plugins.github.pullrequest.ui
+package org.jetbrains.plugins.github.pullrequest
 
 import com.intellij.codeInsight.AutoPopupController
 import com.intellij.openapi.Disposable
@@ -19,10 +19,8 @@ import org.jetbrains.plugins.github.authentication.accounts.GithubAccount
 import org.jetbrains.plugins.github.pullrequest.action.GithubPullRequestKeys
 import org.jetbrains.plugins.github.pullrequest.avatars.CachingGithubAvatarIconsProvider
 import org.jetbrains.plugins.github.pullrequest.config.GithubPullRequestsUISettings
-import org.jetbrains.plugins.github.pullrequest.data.GithubPullRequestsBranchesFetcher
-import org.jetbrains.plugins.github.pullrequest.data.GithubPullRequestsChangesLoader
-import org.jetbrains.plugins.github.pullrequest.data.GithubPullRequestsDetailsLoader
-import org.jetbrains.plugins.github.pullrequest.data.GithubPullRequestsLoader
+import org.jetbrains.plugins.github.pullrequest.data.*
+import org.jetbrains.plugins.github.pullrequest.ui.*
 import org.jetbrains.plugins.github.util.CachingGithubUserAvatarLoader
 import org.jetbrains.plugins.github.util.GithubImageResizer
 import org.jetbrains.plugins.github.util.GithubUrlUtil
@@ -48,7 +46,8 @@ class GithubPullRequestsComponentFactory(private val project: Project,
     val selectionModel = GithubPullRequestsListSelectionModel()
     val list = GithubPullRequestsListComponent(project, actionManager, autoPopupController,
                                                selectionModel, listLoader,
-                                               CachingGithubAvatarIconsProvider.Factory(avatarLoader, imageResizer, requestExecutor))
+                                               CachingGithubAvatarIconsProvider.Factory(
+                                                 avatarLoader, imageResizer, requestExecutor))
 
     val detailsLoader = GithubPullRequestsDetailsLoader(progressManager, requestExecutor, selectionModel)
     val branchFetcher = GithubPullRequestsBranchesFetcher(progressManager, git, detailsLoader, repository, remote)
@@ -65,7 +64,12 @@ class GithubPullRequestsComponentFactory(private val project: Project,
     splitter.secondComponent = preview
 
     // disposed by content manager when tab is closed
-    val wrapper = WrappingComponent(splitter, repository, remote, repoPath, account, listLoader, detailsLoader, branchFetcher)
+    val wrapper = WrappingComponent(splitter,
+                                    repository,
+                                    remote, repoPath,
+                                    account,
+                                    listLoader,
+                                    detailsLoader, branchFetcher)
     Disposer.register(wrapper, Disposable {
       Disposer.dispose(list)
       Disposer.dispose(preview)
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsToolWindowManager.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsToolWindowManager.kt
index 0571421e2629..ebab541fff76 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsToolWindowManager.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsToolWindowManager.kt
@@ -21,7 +21,6 @@ import icons.GithubIcons
 import org.jetbrains.plugins.github.authentication.accounts.AccountTokenChangedListener
 import org.jetbrains.plugins.github.authentication.accounts.GithubAccount
 import org.jetbrains.plugins.github.authentication.accounts.GithubAccountManager
-import org.jetbrains.plugins.github.pullrequest.ui.GithubPullRequestsComponentFactory
 import javax.swing.JComponent
 
 const val TOOL_WINDOW_ID = "GitHub Pull Requests"