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 3b585f41d858..a90cd153b532 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsToolWindowManager.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GithubPullRequestsToolWindowManager.kt
@@ -32,11 +32,11 @@ private val REMOTE_KEY = Key<GitRemote>("REMOTE")
 private val REMOTE_URL_KEY = Key<String>("REMOTE_URL")
 private val ACCOUNT_KEY = Key<GithubAccount>("ACCOUNT")
 
-class GithubPullRequestsToolWindowManager internal constructor(private val project: Project,
-                                                               private val toolWindowManager: ToolWindowManager,
-                                                               private val gitRepositoryManager: GitRepositoryManager,
-                                                               private val accountManager: GithubAccountManager,
-                                                               private val componentFactory: GithubPullRequestsComponentFactory) {
+internal class GithubPullRequestsToolWindowManager(private val project: Project,
+                                                   private val toolWindowManager: ToolWindowManager,
+                                                   private val gitRepositoryManager: GitRepositoryManager,
+                                                   private val accountManager: GithubAccountManager,
+                                                   private val componentFactory: GithubPullRequestsComponentFactory) {
 
   fun createPullRequestsTab(requestExecutor: GithubApiRequestExecutor,
                             repository: GitRepository, remote: GitRemote, remoteUrl: String,
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt
index deea645a66d0..4447dd9981b9 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt
@@ -30,12 +30,12 @@ import java.util.concurrent.CancellationException
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionException
 
-class GithubPullRequestsDataLoader(private val project: Project,
-                                   private val progressManager: ProgressManager,
-                                   private val git: Git,
-                                   private val requestExecutor: GithubApiRequestExecutor,
-                                   private val repository: GitRepository,
-                                   private val remote: GitRemote) : Disposable {
+internal class GithubPullRequestsDataLoader(private val project: Project,
+                                            private val progressManager: ProgressManager,
+                                            private val git: Git,
+                                            private val requestExecutor: GithubApiRequestExecutor,
+                                            private val repository: GitRepository,
+                                            private val remote: GitRemote) : Disposable {
 
   private var isDisposed = false
   private val cache = CacheBuilder.newBuilder()
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt
index 60fdac0ac48a..af0ca2b0acd2 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt
@@ -17,10 +17,10 @@ import org.jetbrains.plugins.github.api.util.GithubApiSearchQueryBuilder
 import org.jetbrains.plugins.github.pullrequest.search.GithubPullRequestSearchQuery
 import java.util.concurrent.CompletableFuture
 
-class GithubPullRequestsLoader(private val progressManager: ProgressManager,
-                               private val requestExecutor: GithubApiRequestExecutor,
-                               private val serverPath: GithubServerPath,
-                               private val repoPath: GithubFullPath) : Disposable {
+internal class GithubPullRequestsLoader(private val progressManager: ProgressManager,
+                                        private val requestExecutor: GithubApiRequestExecutor,
+                                        private val serverPath: GithubServerPath,
+                                        private val repoPath: GithubFullPath) : Disposable {
   private var initialRequest = GithubApiRequests.Search.Issues.get(serverPath, buildQuery(null))
   private var lastFuture = CompletableFuture.completedFuture(GithubResponsePage.empty<GithubSearchedIssue>(initialRequest.url))
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchComponent.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchComponent.kt
index 34b9b9199b42..59f76aa727da 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchComponent.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchComponent.kt
@@ -22,9 +22,9 @@ import org.jetbrains.plugins.github.api.search.GithubIssueSearchSort
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
-class GithubPullRequestSearchComponent(project: Project,
-                                       private val autoPopupController: AutoPopupController,
-                                       private val model: GithubPullRequestSearchModel) : BorderLayoutPanel() {
+internal class GithubPullRequestSearchComponent(project: Project,
+                                                private val autoPopupController: AutoPopupController,
+                                                private val model: GithubPullRequestSearchModel) : BorderLayoutPanel() {
 
   private val searchField = object : TextFieldWithCompletion(project, SearchCompletionProvider(), "", true, true, false, false) {
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchModel.kt
index d40e07c5dae1..ac5f0eff1fb0 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchModel.kt
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.CalledInAwt
 import java.util.*
 import kotlin.properties.Delegates
 
-class GithubPullRequestSearchModel {
+internal class GithubPullRequestSearchModel {
   @get:CalledInAwt
   @set:CalledInAwt
   var query: GithubPullRequestSearchQuery
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchQuery.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchQuery.kt
index 19ae69678989..bcbf795f40c9 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchQuery.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/search/GithubPullRequestSearchQuery.kt
@@ -7,7 +7,7 @@ import org.jetbrains.plugins.github.api.util.GithubApiSearchQueryBuilder
 import java.text.ParseException
 import java.text.SimpleDateFormat
 
-class GithubPullRequestSearchQuery(private val terms: List<Term<*>>) {
+internal class GithubPullRequestSearchQuery(private val terms: List<Term<*>>) {
   fun buildApiSearchQuery(searchQueryBuilder: GithubApiSearchQueryBuilder) {
     for (term in terms) {
       when (term) {
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubDataLoadingComponent.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubDataLoadingComponent.kt
index ecc08310206f..c848a9e84e32 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubDataLoadingComponent.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubDataLoadingComponent.kt
@@ -7,7 +7,7 @@ import org.jetbrains.plugins.github.util.GithubAsyncUtil
 import org.jetbrains.plugins.github.util.handleOnEdt
 import java.util.concurrent.CompletableFuture
 
-abstract class GithubDataLoadingComponent<T> : Wrapper() {
+internal abstract class GithubDataLoadingComponent<T> : Wrapper() {
   private var updateFuture: CompletableFuture<Unit>? = null
 
   /**
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestChangesComponent.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestChangesComponent.kt
index 877db077f603..694b34e1e3cd 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestChangesComponent.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestChangesComponent.kt
@@ -21,7 +21,7 @@ import javax.swing.JComponent
 import javax.swing.border.Border
 import kotlin.properties.Delegates
 
-class GithubPullRequestChangesComponent(project: Project, actionManager: ActionManager)
+internal class GithubPullRequestChangesComponent(project: Project, actionManager: ActionManager)
   : GithubDataLoadingComponent<List<Change>>(), Disposable {
   private val changesBrowser = PullRequestChangesBrowserWithError(project, actionManager)
   private val loadingPanel = JBLoadingPanel(BorderLayout(), this, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS)
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsComponent.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsComponent.kt
index 89b5b2024dfc..37237b9a9907 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsComponent.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsComponent.kt
@@ -9,7 +9,7 @@ import com.intellij.ui.components.JBLoadingPanel
 import org.jetbrains.plugins.github.api.data.GithubPullRequestDetailedWithHtml
 import java.awt.BorderLayout
 
-class GithubPullRequestDetailsComponent(project: Project) : GithubDataLoadingComponent<GithubPullRequestDetailedWithHtml>(), Disposable {
+internal class GithubPullRequestDetailsComponent(project: Project) : GithubDataLoadingComponent<GithubPullRequestDetailedWithHtml>(), Disposable {
   private val detailsPanel = GithubPullRequestDetailsPanel(project)
   private val loadingPanel = JBLoadingPanel(BorderLayout(), this, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS)
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsPanel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsPanel.kt
index db8fd4c62f44..f42ac9fb91a2 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsPanel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestDetailsPanel.kt
@@ -19,7 +19,7 @@ import javax.swing.JPanel
 import javax.swing.ScrollPaneConstants
 import kotlin.properties.Delegates
 
-class GithubPullRequestDetailsPanel(private val project: Project) : Wrapper(), ComponentWithEmptyText {
+internal class GithubPullRequestDetailsPanel(private val project: Project) : Wrapper(), ComponentWithEmptyText {
 
   private val emptyText = object : StatusText() {
     override fun isStatusVisible() = details == null
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestPreviewComponent.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestPreviewComponent.kt
index 28b4cc9004a7..fa8a4212904c 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestPreviewComponent.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestPreviewComponent.kt
@@ -5,8 +5,8 @@ import com.intellij.openapi.Disposable
 import com.intellij.ui.OnePixelSplitter
 import org.jetbrains.plugins.github.pullrequest.data.GithubPullRequestDataProvider
 
-class GithubPullRequestPreviewComponent(private val changes: GithubPullRequestChangesComponent,
-                                        private val details: GithubPullRequestDetailsComponent)
+internal class GithubPullRequestPreviewComponent(private val changes: GithubPullRequestChangesComponent,
+                                                 private val details: GithubPullRequestDetailsComponent)
   : OnePixelSplitter(true, "Github.PullRequest.Preview.Component", 0.6f), Disposable {
 
   val toolbarComponent = changes.toolbarComponent
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListComponent.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListComponent.kt
index d5ecd666bfaa..00ff7783e23d 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListComponent.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListComponent.kt
@@ -31,11 +31,11 @@ import javax.swing.JScrollBar
 import javax.swing.ScrollPaneConstants
 import javax.swing.event.ListSelectionEvent
 
-class GithubPullRequestsListComponent internal constructor(project: Project,
-                                                           actionManager: ActionManager,
-                                                           autoPopupController: AutoPopupController,
-                                                           private val loader: GithubPullRequestsLoader,
-                                                           avatarIconsProviderFactory: CachingGithubAvatarIconsProvider.Factory)
+internal class GithubPullRequestsListComponent(project: Project,
+                                               actionManager: ActionManager,
+                                               autoPopupController: AutoPopupController,
+                                               private val loader: GithubPullRequestsLoader,
+                                               avatarIconsProviderFactory: CachingGithubAvatarIconsProvider.Factory)
   : BorderLayoutPanel(), Disposable, DataProvider {
 
   val selectionModel = GithubPullRequestsListSelectionModel()
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListSelectionModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListSelectionModel.kt
index 843ba7f19aaa..05d8d9d91078 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListSelectionModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/GithubPullRequestsListSelectionModel.kt
@@ -7,7 +7,7 @@ import org.jetbrains.plugins.github.api.data.GithubSearchedIssue
 import java.util.*
 import kotlin.properties.Delegates
 
-class GithubPullRequestsListSelectionModel {
+internal class GithubPullRequestsListSelectionModel {
   var current: GithubSearchedIssue? by Delegates.observable<GithubSearchedIssue?>(null) { _, _, _ ->
     changeEventDispatcher.multicaster.selectionChanged()
   }