diff --git a/platform/structuralsearch/source/META-INF/structuralsearch.xml b/platform/structuralsearch/source/META-INF/structuralsearch.xml
index f18306d16dd8..be5d2e3ecb25 100644
--- a/platform/structuralsearch/source/META-INF/structuralsearch.xml
+++ b/platform/structuralsearch/source/META-INF/structuralsearch.xml
@@ -20,7 +20,7 @@
     <completion.contributor language="any" implementationClass="com.intellij.structuralsearch.plugin.ui.StructuralSearchTemplatesCompletionContributor"/>
     <documentationProvider implementation="com.intellij.structuralsearch.plugin.ui.StructuralSearchTemplateDocumentationProvider"/>
     <codeInsight.linkHandler prefix="#ssr_edit_filters/" handlerClass="com.intellij.structuralsearch.plugin.ui.filters.FilterTooltipLinkHandler"/>
-    <daemon.highlightInfoFilter implementation="com.intellij.structuralsearch.StructuralSearchHighlightInfoFilter"/>
+    <daemon.highlightInfoFilter implementation="com.intellij.structuralsearch.plugin.ui.StructuralSearchHighlightInfoFilter"/>
   </extensions>
 
   <actions>
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchHighlightInfoFilter.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchHighlightInfoFilter.java
similarity index 87%
rename from platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchHighlightInfoFilter.java
rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchHighlightInfoFilter.java
index fad68e104cca..1d7de4e533d1 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchHighlightInfoFilter.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchHighlightInfoFilter.java
@@ -1,11 +1,14 @@
 // Copyright 2000-2019 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 com.intellij.structuralsearch;
+package com.intellij.structuralsearch.plugin.ui;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoFilter;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.editor.Document;
 import com.intellij.psi.*;
+import com.intellij.structuralsearch.PatternContext;
+import com.intellij.structuralsearch.StructuralSearchProfile;
+import com.intellij.structuralsearch.StructuralSearchUtil;
 import com.intellij.structuralsearch.plugin.ui.StructuralSearchDialog;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchTemplateBuilder.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchTemplateBuilder.java
similarity index 97%
rename from platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchTemplateBuilder.java
rename to platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchTemplateBuilder.java
index d7399a470cf4..ac0c83ab2733 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchTemplateBuilder.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchTemplateBuilder.java
@@ -1,5 +1,5 @@
 // Copyright 2000-2019 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 com.intellij.structuralsearch;
+package com.intellij.structuralsearch.plugin.ui;
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
@@ -9,6 +9,7 @@ import com.intellij.codeInsight.template.impl.ConstantNode;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
+import com.intellij.structuralsearch.MatchOptions;
 import com.intellij.structuralsearch.impl.matcher.MatcherImplUtil;
 import com.intellij.structuralsearch.impl.matcher.PatternTreeContext;
 import com.intellij.util.ArrayUtil;
diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSTemplateBuilderTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSTemplateBuilderTest.java
index 31a267ad1c6f..0282a99172a8 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSTemplateBuilderTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSTemplateBuilderTest.java
@@ -7,6 +7,7 @@ import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.psi.PsiFile;
+import com.intellij.structuralsearch.plugin.ui.StructuralSearchTemplateBuilder;
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
 
 public class SSTemplateBuilderTest extends LightJavaCodeInsightFixtureTestCase {