diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0ad7db32164b..f72899da7a62 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -894,8 +894,9 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/package-search/gradle/tooling/intellij.packageSearch.gradle.tooling.iml" filepath="$PROJECT_DIR$/plugins/package-search/gradle/tooling/intellij.packageSearch.gradle.tooling.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/package-search/kotlin/intellij.packageSearch.kotlin.iml" filepath="$PROJECT_DIR$/plugins/package-search/kotlin/intellij.packageSearch.kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/package-search/maven/intellij.packageSearch.maven.iml" filepath="$PROJECT_DIR$/plugins/package-search/maven/intellij.packageSearch.maven.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/intellij.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/intellij.performanceTesting.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/backend/observation/intellij.platform.backend.observation.iml" filepath="$PROJECT_DIR$/platform/backend/observation/intellij.platform.backend.observation.iml" />
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java
diff --git a/plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java
similarity index 100%
rename from plugins/performanceTesting/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java
rename to plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java
diff --git a/plugins/performanceTesting/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml
similarity index 100%
rename from plugins/performanceTesting/intellij.performanceTesting.iml
rename to plugins/performanceTesting/core/intellij.performanceTesting.iml
diff --git a/plugins/performanceTesting/resources/META-INF/plugin.xml b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
similarity index 100%
rename from plugins/performanceTesting/resources/META-INF/plugin.xml
rename to plugins/performanceTesting/core/resources/META-INF/plugin.xml
diff --git a/plugins/performanceTesting/resources/commandDescriptions/waitJpsBuildCommand.html b/plugins/performanceTesting/core/resources/commandDescriptions/waitJpsBuildCommand.html
similarity index 100%
rename from plugins/performanceTesting/resources/commandDescriptions/waitJpsBuildCommand.html
rename to plugins/performanceTesting/core/resources/commandDescriptions/waitJpsBuildCommand.html
diff --git a/plugins/performanceTesting/resources/messages/PerformanceTestingBundle.properties b/plugins/performanceTesting/core/resources/messages/PerformanceTestingBundle.properties
similarity index 100%
rename from plugins/performanceTesting/resources/messages/PerformanceTestingBundle.properties
rename to plugins/performanceTesting/core/resources/messages/PerformanceTestingBundle.properties
diff --git a/plugins/performanceTesting/resources/static/img/icon-robots.txt b/plugins/performanceTesting/core/resources/static/img/icon-robots.txt
similarity index 100%
rename from plugins/performanceTesting/resources/static/img/icon-robots.txt
rename to plugins/performanceTesting/core/resources/static/img/icon-robots.txt
diff --git a/plugins/performanceTesting/resources/static/img/locator.png b/plugins/performanceTesting/core/resources/static/img/locator.png
similarity index 100%
rename from plugins/performanceTesting/resources/static/img/locator.png
rename to plugins/performanceTesting/core/resources/static/img/locator.png
diff --git a/plugins/performanceTesting/resources/static/img/show.png b/plugins/performanceTesting/core/resources/static/img/show.png
similarity index 100%
rename from plugins/performanceTesting/resources/static/img/show.png
rename to plugins/performanceTesting/core/resources/static/img/show.png
diff --git a/plugins/performanceTesting/resources/static/scripts.js b/plugins/performanceTesting/core/resources/static/scripts.js
similarity index 100%
rename from plugins/performanceTesting/resources/static/scripts.js
rename to plugins/performanceTesting/core/resources/static/scripts.js
diff --git a/plugins/performanceTesting/resources/static/styles.css b/plugins/performanceTesting/core/resources/static/styles.css
similarity index 100%
rename from plugins/performanceTesting/resources/static/styles.css
rename to plugins/performanceTesting/core/resources/static/styles.css
diff --git a/plugins/performanceTesting/resources/static/updateButton.js b/plugins/performanceTesting/core/resources/static/updateButton.js
similarity index 100%
rename from plugins/performanceTesting/resources/static/updateButton.js
rename to plugins/performanceTesting/core/resources/static/updateButton.js
diff --git a/plugins/performanceTesting/resources/static/xpathEditor.js b/plugins/performanceTesting/core/resources/static/xpathEditor.js
similarity index 100%
rename from plugins/performanceTesting/resources/static/xpathEditor.js
rename to plugins/performanceTesting/core/resources/static/xpathEditor.js
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/BaseCommandProvider.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/BaseCommandProvider.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/BaseCommandProvider.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/BaseCommandProvider.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/BaseRunCallbackHandler.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/BaseRunCallbackHandler.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/BaseRunCallbackHandler.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/BaseRunCallbackHandler.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/CommandLogger.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CommandLogger.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/CommandLogger.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CommandLogger.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/CommandProvider.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CommandProvider.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/CommandProvider.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CommandProvider.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/CommandsRunner.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CommandsRunner.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/CommandsRunner.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CommandsRunner.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/CreateCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CreateCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/CreateCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/CreateCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/FakeBrowser.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/FakeBrowser.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/FakeBrowser.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/FakeBrowser.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/OnEndListener.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/OnEndListener.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/OnEndListener.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/OnEndListener.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestSpan.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTestSpan.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestSpan.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTestSpan.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestTotalTimeTimer.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTestTotalTimeTimer.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestTotalTimeTimer.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTestTotalTimeTimer.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTroubleInfoCollector.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTroubleInfoCollector.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTroubleInfoCollector.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PerformanceTroubleInfoCollector.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PlaybackRunnerExtended.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PlaybackRunnerExtended.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/PlaybackRunnerExtended.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/PlaybackRunnerExtended.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectIndexingComponent.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectIndexingComponent.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectIndexingComponent.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectIndexingComponent.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectInitializationDiagnosticServiceImpl.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectInitializationDiagnosticServiceImpl.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectInitializationDiagnosticServiceImpl.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectInitializationDiagnosticServiceImpl.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectLoaded.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectLoaded.kt
similarity index 98%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectLoaded.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectLoaded.kt
index 9e5134049407..03101ac2b29e 100644
--- a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ProjectLoaded.kt
+++ b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ProjectLoaded.kt
@@ -187,8 +187,8 @@ class ProjectLoaded : ApplicationInitializedListener {
   override suspend fun execute(asyncScope: CoroutineScope) {
     if (System.getProperty("com.sun.management.jmxremote") == "true") {
       service<InvokerService>().register({ PerformanceTestSpan.TRACER },
-                            { PerformanceTestSpan.getContext() },
-                            { takeScreenshotOfAllWindowsBlocking(it) })
+                                         { PerformanceTestSpan.getContext() },
+                                         { takeScreenshotOfAllWindowsBlocking(it) })
     }
 
     if (ApplicationManagerEx.getApplicationEx().isLightEditMode) {
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/RunCallbackHandler.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/RunCallbackHandler.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/RunCallbackHandler.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/RunCallbackHandler.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/SpanBuilderWithSystemInfoAttributes.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/SpanBuilderWithSystemInfoAttributes.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/SpanBuilderWithSystemInfoAttributes.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/SpanBuilderWithSystemInfoAttributes.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/SpanWithOnEndListener.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/SpanWithOnEndListener.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/SpanWithOnEndListener.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/SpanWithOnEndListener.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/Timer.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/Timer.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/Timer.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/Timer.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/WarmupIJTracer.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/WarmupIJTracer.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/WarmupIJTracer.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/WarmupIJTracer.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/actions/CaptureMemorySnapshotAction.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/CaptureMemorySnapshotAction.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/actions/CaptureMemorySnapshotAction.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/CaptureMemorySnapshotAction.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/actions/OpenIndexingDiagnosticsAction.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/OpenIndexingDiagnosticsAction.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/actions/OpenIndexingDiagnosticsAction.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/OpenIndexingDiagnosticsAction.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AcceptDecompileNotice.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AcceptDecompileNotice.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AcceptDecompileNotice.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AcceptDecompileNotice.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AddFileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AddFileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AddFileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AddFileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertCompletionCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertCompletionCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertCompletionCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertCompletionCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertEncodingFileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertEncodingFileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertEncodingFileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertEncodingFileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertFindUsagesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertFindUsagesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertFindUsagesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertFindUsagesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkArguments.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkArguments.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkArguments.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkArguments.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkVersionCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkVersionCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkVersionCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertModuleJdkVersionCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertOpenedFileInSpecificRoot.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertOpenedFileInSpecificRoot.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/AssertOpenedFileInSpecificRoot.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/AssertOpenedFileInSpecificRoot.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CaptureMemoryMetricsCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CaptureMemoryMetricsCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CaptureMemoryMetricsCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CaptureMemoryMetricsCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ChooseCompletionCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ChooseCompletionCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ChooseCompletionCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ChooseCompletionCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CleanCaches.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CleanCaches.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CleanCaches.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CleanCaches.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CloseAllTabsCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CloseAllTabsCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CloseAllTabsCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CloseAllTabsCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CodeAnalysisCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CodeAnalysisCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CodeAnalysisCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CodeAnalysisCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CollectAllFilesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CollectAllFilesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CollectAllFilesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CollectAllFilesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CollectFilesNotMarkedAsIndex.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CollectFilesNotMarkedAsIndex.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CollectFilesNotMarkedAsIndex.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CollectFilesNotMarkedAsIndex.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CommandArguments.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CommandArguments.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CommandArguments.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CommandArguments.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CompareIndices.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CompareIndices.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CompareIndices.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CompareIndices.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CompareProjectFiles.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CompareProjectFiles.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CompareProjectFiles.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CompareProjectFiles.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CompletionCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CompletionCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CompletionCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CompletionCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ConditionalMemoryDumpCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ConditionalMemoryDumpCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ConditionalMemoryDumpCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ConditionalMemoryDumpCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CorruptIndexesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CorruptIndexesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CorruptIndexesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CorruptIndexesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CreateAllServicesAndExtensionsCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CreateAllServicesAndExtensionsCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/CreateAllServicesAndExtensionsCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/CreateAllServicesAndExtensionsCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DebugRunConfigurationCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DebugRunConfigurationCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DebugRunConfigurationCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DebugRunConfigurationCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DebugStepCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DebugStepCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DebugStepCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DebugStepCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DelayTypeCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DelayTypeCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DelayTypeCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DelayTypeCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DeleteFileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DeleteFileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DeleteFileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DeleteFileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DoHighlighting.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DoHighlighting.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DoHighlighting.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DoHighlighting.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DoLocalInspection.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DoLocalInspection.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DoLocalInspection.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DoLocalInspection.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DropErrorCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DropErrorCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DropErrorCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DropErrorCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionArguments.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionArguments.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionArguments.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionArguments.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionCompletionCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionCompletionCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionCompletionCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/EvaluateExpressionCompletionCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExecuteEditorActionCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExecuteEditorActionCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExecuteEditorActionCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExecuteEditorActionCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExitAppCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExitAppCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExitAppCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExitAppCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExitAppWithTimeoutCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExitAppWithTimeoutCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExitAppWithTimeoutCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExitAppWithTimeoutCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExitMetrics.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExitMetrics.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExitMetrics.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExitMetrics.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandEditorMenuCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandEditorMenuCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandEditorMenuCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandEditorMenuCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandMainMenuCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandMainMenuCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandMainMenuCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandMainMenuCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandMenuCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandMenuCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandMenuCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandMenuCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandProjectMenuCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandProjectMenuCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ExpandProjectMenuCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ExpandProjectMenuCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesArguments.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FindUsagesArguments.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesArguments.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FindUsagesArguments.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FindUsagesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesDumper.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FindUsagesDumper.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FindUsagesDumper.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FindUsagesDumper.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FinishInlineRename.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FinishInlineRename.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FinishInlineRename.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FinishInlineRename.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FlushFusEventsCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FlushFusEventsCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FlushFusEventsCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FlushFusEventsCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FlushIndexesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FlushIndexesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FlushIndexesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FlushIndexesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FreezeUICommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FreezeUICommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/FreezeUICommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/FreezeUICommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToNamedElementCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToNamedElementCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToNamedElementCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToNamedElementCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToNextPsiElement.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToNextPsiElement.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToNextPsiElement.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToNextPsiElement.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/GoToPsiElement.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/IdeEditorKeyCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/IdeEditorKeyCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/IdeEditorKeyCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/IdeEditorKeyCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/InspectionCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/InspectionCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/InspectionCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/InspectionCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/InspectionCommandEx.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/InspectionCommandEx.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/InspectionCommandEx.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/InspectionCommandEx.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/InstallCustomJBR.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/InstallCustomJBR.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/InstallCustomJBR.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/InstallCustomJBR.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MeasureVFSUpdateCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MeasureVFSUpdateCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MeasureVFSUpdateCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MeasureVFSUpdateCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MemoryCapture.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MemoryCapture.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MemoryCapture.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MemoryCapture.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MemoryDumpCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MemoryDumpCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MemoryDumpCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MemoryDumpCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MemoryMetrics.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MemoryMetrics.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MemoryMetrics.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MemoryMetrics.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MoveCaretCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MoveCaretCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MoveCaretCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MoveCaretCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MoveDirectoryCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MoveDirectoryCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/MoveDirectoryCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/MoveDirectoryCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenFileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenFileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenFileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenFileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenFileCommandOptions.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenFileCommandOptions.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenFileCommandOptions.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenFileCommandOptions.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenFileWithTerminateCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenFileWithTerminateCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenFileWithTerminateCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenFileWithTerminateCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenProjectCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenProjectCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenProjectCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenProjectCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenProjectView.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenProjectView.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenProjectView.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenProjectView.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenRandomFileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenRandomFileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/OpenRandomFileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/OpenRandomFileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/PerformanceCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/PerformanceCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/PerformanceCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/PerformanceCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/PerformanceCommandCoroutineAdapter.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/PerformanceCommandCoroutineAdapter.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/PerformanceCommandCoroutineAdapter.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/PerformanceCommandCoroutineAdapter.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RecordCounterCollectorBaselinesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RecordCounterCollectorBaselinesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RecordCounterCollectorBaselinesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RecordCounterCollectorBaselinesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RecordStateCollectorsCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RecordStateCollectorsCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RecordStateCollectorsCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RecordStateCollectorsCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RecoveryActionCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RecoveryActionCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RecoveryActionCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RecoveryActionCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReformatCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReformatCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReformatCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReformatCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReloadFilesCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReloadFilesCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReloadFilesCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReloadFilesCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RemoveBreakpointCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RemoveBreakpointCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RemoveBreakpointCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RemoveBreakpointCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RenameFileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RenameFileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RenameFileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RenameFileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReplaceBrowser.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReplaceBrowser.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReplaceBrowser.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReplaceBrowser.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReplaceTextCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReplaceTextCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ReplaceTextCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReplaceTextCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RunClassInPlugin.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunClassInPlugin.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RunClassInPlugin.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunClassInPlugin.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RunConfigurationCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunConfigurationCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RunConfigurationCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunConfigurationCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SaveDocumentsAndSettingsCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SaveDocumentsAndSettingsCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SaveDocumentsAndSettingsCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SaveDocumentsAndSettingsCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SearchEverywhereCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SearchEverywhereCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SearchEverywhereCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SearchEverywhereCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SelectCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SelectCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SelectCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SelectCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SelectFileInProjectViewCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SelectFileInProjectViewCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SelectFileInProjectViewCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SelectFileInProjectViewCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetBreakpointCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetBreakpointCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetBreakpointCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetBreakpointCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetModuleJdkArguments.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetModuleJdkArguments.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetModuleJdkArguments.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetModuleJdkArguments.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetModuleJdkCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetModuleJdkCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetModuleJdkCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetModuleJdkCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkUtil.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkUtil.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkUtil.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SetupProjectSdkUtil.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowAltEnter.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowAltEnter.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowAltEnter.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowAltEnter.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowEvaluateExpressionCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowEvaluateExpressionCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowEvaluateExpressionCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowEvaluateExpressionCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowFileStructurePopupCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowFileStructurePopupCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowFileStructurePopupCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowFileStructurePopupCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowRecentFilesCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowRecentFilesCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/ShowRecentFilesCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ShowRecentFilesCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SingleInspectionCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SingleInspectionCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SingleInspectionCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SingleInspectionCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SleepCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SleepCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/SleepCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/SleepCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StartInlineRenameCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StartInlineRenameCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StartInlineRenameCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StartInlineRenameCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StartPowerSave.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StartPowerSave.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StartPowerSave.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StartPowerSave.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StartProfileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StartProfileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StartProfileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StartProfileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StopDebugProcessCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StopDebugProcessCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StopDebugProcessCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StopDebugProcessCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StopPowerSave.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StopPowerSave.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StopPowerSave.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StopPowerSave.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StopProfileCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StopProfileCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StopProfileCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StopProfileCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StoreIndices.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StoreIndices.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/StoreIndices.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/StoreIndices.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/TakeScreenshotCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/TakeScreenshotCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/TakeScreenshotCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/TakeScreenshotCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/TakeThreadDumpCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/TakeThreadDumpCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/TakeThreadDumpCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/TakeThreadDumpCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForDumbCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForDumbCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForDumbCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForDumbCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForFinishedCodeAnalysis.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForFinishedCodeAnalysis.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForFinishedCodeAnalysis.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForFinishedCodeAnalysis.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForInitialRefreshCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForInitialRefreshCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForInitialRefreshCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForInitialRefreshCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForSmartCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForSmartCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitForSmartCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitForSmartCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitJpsBuildCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitJpsBuildCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitJpsBuildCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitJpsBuildCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitVcsLogIndexingCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitVcsLogIndexingCommand.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/WaitVcsLogIndexingCommand.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitVcsLogIndexingCommand.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/Waiter.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/Waiter.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/commands/Waiter.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/Waiter.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/jmxDriver/InvokerService.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/jmxDriver/InvokerService.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/jmxDriver/InvokerService.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/jmxDriver/InvokerService.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/jmxDriver/RemoteDevInvoker.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/jmxDriver/RemoteDevInvoker.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/jmxDriver/RemoteDevInvoker.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/jmxDriver/RemoteDevInvoker.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/doc/IJPerfDocumentationProvider.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/doc/IJPerfDocumentationProvider.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/doc/IJPerfDocumentationProvider.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/doc/IJPerfDocumentationProvider.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/Profiler.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/Profiler.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/Profiler.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/Profiler.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/ProfilerHandlerUtils.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/ProfilerHandlerUtils.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/ProfilerHandlerUtils.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/ProfilerHandlerUtils.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/ProfilersController.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/ProfilersController.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/ProfilersController.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/ProfilersController.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/SnapshotOpener.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/SnapshotOpener.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/profilers/SnapshotOpener.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/profilers/SnapshotOpener.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.form b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.form
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.form
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.form
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/FinishScriptDialog.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/AbstractCallbackBasedCommand.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/AbstractCallbackBasedCommand.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/AbstractCallbackBasedCommand.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/AbstractCallbackBasedCommand.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ActionCallbackProfilerStopper.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ActionCallbackProfilerStopper.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ActionCallbackProfilerStopper.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ActionCallbackProfilerStopper.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/CommandArgumentsExtensions.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/CommandArgumentsExtensions.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/CommandArgumentsExtensions.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/CommandArgumentsExtensions.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/DaemonCodeAnalyzerListener.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/DaemonCodeAnalyzerListener.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/DaemonCodeAnalyzerListener.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/DaemonCodeAnalyzerListener.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/DataDumper.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/DataDumper.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/DataDumper.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/DataDumper.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/EditorUtils.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/EditorUtils.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/EditorUtils.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/EditorUtils.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/HardwareCollector.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/HardwareCollector.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/HardwareCollector.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/HardwareCollector.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/JvmRuntimeUtils.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/JvmRuntimeUtils.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/JvmRuntimeUtils.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/JvmRuntimeUtils.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ReporterCommandAsTelemetrySpan.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ReporterCommandAsTelemetrySpan.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ReporterCommandAsTelemetrySpan.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ReporterCommandAsTelemetrySpan.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ReporterWithTimer.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ReporterWithTimer.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ReporterWithTimer.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ReporterWithTimer.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ResultsToFileProcessor.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ResultsToFileProcessor.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ResultsToFileProcessor.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ResultsToFileProcessor.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/SafeSpanStack.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/SafeSpanStack.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/SafeSpanStack.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/SafeSpanStack.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ScriptRunner.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ScriptRunner.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/ScriptRunner.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/ScriptRunner.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/StatisticCollector.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/StatisticCollector.java
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/StatisticCollector.java
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/StatisticCollector.java
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/TimeArgumentParserUtil.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/TimeArgumentParserUtil.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/TimeArgumentParserUtil.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/TimeArgumentParserUtil.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/VcsTestUtil.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/VcsTestUtil.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/VcsTestUtil.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/VcsTestUtil.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/errors/ErrorCollector.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/errors/ErrorCollector.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/errors/ErrorCollector.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/errors/ErrorCollector.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/errors/ToDirectoryWritingErrorCollector.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/errors/ToDirectoryWritingErrorCollector.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/errors/ToDirectoryWritingErrorCollector.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/errors/ToDirectoryWritingErrorCollector.kt
diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/indexes/CurrentIndexedFileResolver.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/indexes/CurrentIndexedFileResolver.kt
similarity index 100%
rename from plugins/performanceTesting/src/com/jetbrains/performancePlugin/utils/indexes/CurrentIndexedFileResolver.kt
rename to plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/indexes/CurrentIndexedFileResolver.kt
diff --git a/plugins/performanceTesting/testData/completion/afterCommand.ijperf b/plugins/performanceTesting/core/testData/completion/afterCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/afterCommand.ijperf
rename to plugins/performanceTesting/core/testData/completion/afterCommand.ijperf
diff --git a/plugins/performanceTesting/testData/completion/betweenStatements.ijperf b/plugins/performanceTesting/core/testData/completion/betweenStatements.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/betweenStatements.ijperf
rename to plugins/performanceTesting/core/testData/completion/betweenStatements.ijperf
diff --git a/plugins/performanceTesting/testData/completion/doublePrefix.ijperf b/plugins/performanceTesting/core/testData/completion/doublePrefix.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/doublePrefix.ijperf
rename to plugins/performanceTesting/core/testData/completion/doublePrefix.ijperf
diff --git a/plugins/performanceTesting/testData/completion/emptyFile.ijperf b/plugins/performanceTesting/core/testData/completion/emptyFile.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/emptyFile.ijperf
rename to plugins/performanceTesting/core/testData/completion/emptyFile.ijperf
diff --git a/plugins/performanceTesting/testData/completion/endOfStatement.ijperf b/plugins/performanceTesting/core/testData/completion/endOfStatement.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/endOfStatement.ijperf
rename to plugins/performanceTesting/core/testData/completion/endOfStatement.ijperf
diff --git a/plugins/performanceTesting/testData/completion/inOptionList.ijperf b/plugins/performanceTesting/core/testData/completion/inOptionList.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/inOptionList.ijperf
rename to plugins/performanceTesting/core/testData/completion/inOptionList.ijperf
diff --git a/plugins/performanceTesting/testData/completion/onCommand.ijperf b/plugins/performanceTesting/core/testData/completion/onCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/onCommand.ijperf
rename to plugins/performanceTesting/core/testData/completion/onCommand.ijperf
diff --git a/plugins/performanceTesting/testData/completion/singlePrefix.ijperf b/plugins/performanceTesting/core/testData/completion/singlePrefix.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/singlePrefix.ijperf
rename to plugins/performanceTesting/core/testData/completion/singlePrefix.ijperf
diff --git a/plugins/performanceTesting/testData/completion/withoutPrefix.ijperf b/plugins/performanceTesting/core/testData/completion/withoutPrefix.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/completion/withoutPrefix.ijperf
rename to plugins/performanceTesting/core/testData/completion/withoutPrefix.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/commandWithoutParams.ijperf b/plugins/performanceTesting/core/testData/lexer/commandWithoutParams.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/commandWithoutParams.ijperf
rename to plugins/performanceTesting/core/testData/lexer/commandWithoutParams.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/commandWithoutParams.txt b/plugins/performanceTesting/core/testData/lexer/commandWithoutParams.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/commandWithoutParams.txt
rename to plugins/performanceTesting/core/testData/lexer/commandWithoutParams.txt
diff --git a/plugins/performanceTesting/testData/lexer/comment.ijperf b/plugins/performanceTesting/core/testData/lexer/comment.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/comment.ijperf
rename to plugins/performanceTesting/core/testData/lexer/comment.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/comment.txt b/plugins/performanceTesting/core/testData/lexer/comment.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/comment.txt
rename to plugins/performanceTesting/core/testData/lexer/comment.txt
diff --git a/plugins/performanceTesting/testData/lexer/doublePrefixCommand.ijperf b/plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/doublePrefixCommand.ijperf
rename to plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/doublePrefixCommand.txt b/plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/doublePrefixCommand.txt
rename to plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.txt
diff --git a/plugins/performanceTesting/testData/lexer/filePathInParameters.ijperf b/plugins/performanceTesting/core/testData/lexer/filePathInParameters.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/filePathInParameters.ijperf
rename to plugins/performanceTesting/core/testData/lexer/filePathInParameters.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/filePathInParameters.txt b/plugins/performanceTesting/core/testData/lexer/filePathInParameters.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/filePathInParameters.txt
rename to plugins/performanceTesting/core/testData/lexer/filePathInParameters.txt
diff --git a/plugins/performanceTesting/testData/lexer/numberOptions.ijperf b/plugins/performanceTesting/core/testData/lexer/numberOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/numberOptions.ijperf
rename to plugins/performanceTesting/core/testData/lexer/numberOptions.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/numberOptions.txt b/plugins/performanceTesting/core/testData/lexer/numberOptions.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/numberOptions.txt
rename to plugins/performanceTesting/core/testData/lexer/numberOptions.txt
diff --git a/plugins/performanceTesting/testData/lexer/optionWithValue.ijperf b/plugins/performanceTesting/core/testData/lexer/optionWithValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/optionWithValue.ijperf
rename to plugins/performanceTesting/core/testData/lexer/optionWithValue.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/optionWithValue.txt b/plugins/performanceTesting/core/testData/lexer/optionWithValue.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/optionWithValue.txt
rename to plugins/performanceTesting/core/testData/lexer/optionWithValue.txt
diff --git a/plugins/performanceTesting/testData/lexer/pipeSeparatedOption.ijperf b/plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/pipeSeparatedOption.ijperf
rename to plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/pipeSeparatedOption.txt b/plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/pipeSeparatedOption.txt
rename to plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.txt
diff --git a/plugins/performanceTesting/testData/lexer/scriptWithEmptyLines.ijperf b/plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/scriptWithEmptyLines.ijperf
rename to plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/scriptWithEmptyLines.txt b/plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/scriptWithEmptyLines.txt
rename to plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.txt
diff --git a/plugins/performanceTesting/testData/lexer/singlePrefixCommand.ijperf b/plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/singlePrefixCommand.ijperf
rename to plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/singlePrefixCommand.txt b/plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/singlePrefixCommand.txt
rename to plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.txt
diff --git a/plugins/performanceTesting/testData/lexer/spaceSeparatedParameters.ijperf b/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/spaceSeparatedParameters.ijperf
rename to plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/spaceSeparatedParameters.txt b/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/spaceSeparatedParameters.txt
rename to plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.txt
diff --git a/plugins/performanceTesting/testData/lexer/spaceSeparatedParametersValue.ijperf b/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/spaceSeparatedParametersValue.ijperf
rename to plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/spaceSeparatedParametersValue.txt b/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/spaceSeparatedParametersValue.txt
rename to plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.txt
diff --git a/plugins/performanceTesting/testData/lexer/textOptionWithSymbols.ijperf b/plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/textOptionWithSymbols.ijperf
rename to plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.ijperf
diff --git a/plugins/performanceTesting/testData/lexer/textOptionWithSymbols.txt b/plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.txt
similarity index 100%
rename from plugins/performanceTesting/testData/lexer/textOptionWithSymbols.txt
rename to plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithFilePathInParameters.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithFilePathInParameters.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithFilePathInParameters.txt b/plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithFilePathInParameters.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithNumberOptions.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithNumberOptions.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithNumberOptions.txt b/plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithNumberOptions.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithPipeOptionSeparator.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithPipeOptionSeparator.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithPipeOptionSeparator.txt b/plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithPipeOptionSeparator.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSeveralOptions.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSeveralOptions.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSeveralOptions.txt b/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSeveralOptions.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsSeparated.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsSeparated.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsSeparated.txt b/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsSeparated.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsWithValue.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsWithValue.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsWithValue.txt b/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSeveralOptionsWithValue.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSimpleOption.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSimpleOption.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSimpleOption.txt b/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSimpleOption.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSimpleOptionWithValue.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSimpleOptionWithValue.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithSimpleOptionWithValue.txt b/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithSimpleOptionWithValue.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.txt
diff --git a/plugins/performanceTesting/testData/parser/CommandWithoutOptions.ijperf b/plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithoutOptions.ijperf
rename to plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.ijperf
diff --git a/plugins/performanceTesting/testData/parser/CommandWithoutOptions.txt b/plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/CommandWithoutOptions.txt
rename to plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.txt
diff --git a/plugins/performanceTesting/testData/parser/SimpleExample.ijperf b/plugins/performanceTesting/core/testData/parser/SimpleExample.ijperf
similarity index 100%
rename from plugins/performanceTesting/testData/parser/SimpleExample.ijperf
rename to plugins/performanceTesting/core/testData/parser/SimpleExample.ijperf
diff --git a/plugins/performanceTesting/testData/parser/SimpleExample.txt b/plugins/performanceTesting/core/testData/parser/SimpleExample.txt
similarity index 100%
rename from plugins/performanceTesting/testData/parser/SimpleExample.txt
rename to plugins/performanceTesting/core/testData/parser/SimpleExample.txt
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/GenerifyExceptionMessageTest.kt b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/GenerifyExceptionMessageTest.kt
similarity index 100%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/GenerifyExceptionMessageTest.kt
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/GenerifyExceptionMessageTest.kt
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/RunClassInPluginCommandTest.java b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/RunClassInPluginCommandTest.java
similarity index 100%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/RunClassInPluginCommandTest.java
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/RunClassInPluginCommandTest.java
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/SetupProjectSdkCommandTest.java b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/SetupProjectSdkCommandTest.java
similarity index 100%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/SetupProjectSdkCommandTest.java
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/SetupProjectSdkCommandTest.java
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/TestUtil.java b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/TestUtil.java
similarity index 77%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/TestUtil.java
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/TestUtil.java
index 5d0e5b985d33..7c36b6ab906f 100644
--- a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/TestUtil.java
+++ b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/TestUtil.java
@@ -9,6 +9,6 @@ public final class TestUtil {
 
   @NonNls
   public static String getDataSubPath(@NonNls String theme) {
-    return "/plugins/performanceTesting/testData/" + theme;
+    return "/plugins/performanceTesting/core/testData/" + theme;
   }
 }
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/commands/OpenFileCommandOptionsTest.kt b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/commands/OpenFileCommandOptionsTest.kt
similarity index 100%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/commands/OpenFileCommandOptionsTest.kt
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/commands/OpenFileCommandOptionsTest.kt
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
similarity index 98%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
index 05d140711b78..a7826dcf995c 100644
--- a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
+++ b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
@@ -96,6 +96,6 @@ public class IJPerfCompletionTest extends BasePlatformTestCase {
 
   @Override
   protected String getTestDataPath() {
-    return PathManager.getHomePath() + TestUtil.getDataSubPath("completion");
+    return PathManager.getCommunityHomePath() + TestUtil.getDataSubPath("completion");
   }
 }
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
similarity index 84%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
index 945ce31078c2..fd00eb0119e7 100644
--- a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
+++ b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
@@ -1,6 +1,7 @@
 package com.jetbrains.performancePlugin.lang.lexer;
 
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.testFramework.LexerTestCase;
 import com.jetbrains.performancePlugin.TestUtil;
 import com.jetbrains.performancePlugin.lang.IJPerfFileType;
@@ -65,6 +66,11 @@ public class IJPerfLexerTest extends LexerTestCase {
     return new IJPerfLexerAdapter();
   }
 
+  @Override
+  protected @NotNull String getPathToTestDataFile(@NotNull String extension) {
+    return PathManager.getCommunityHomePath() + "/" + getDirPath() + "/" + getTestName(true) + extension;
+  }
+
   @Override
   protected @NotNull String getDirPath() {
     return TestUtil.getDataSubPath("lexer");
diff --git a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
similarity index 94%
rename from plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
rename to plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
index 71dbddd86007..aa5fd57c4357 100644
--- a/plugins/performanceTesting/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
+++ b/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
@@ -56,6 +56,6 @@ public class IJPerfParserTest extends ParsingTestCase {
   @Override
   @NonNls
   protected String getTestDataPath() {
-    return PathManager.getHomePath() + TestUtil.getDataSubPath("");
+    return PathManager.getCommunityHomePath() + TestUtil.getDataSubPath("");
   }
 }
diff --git a/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml
new file mode 100644
index 000000000000..54b8c267c1c9
--- /dev/null
+++ b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/performanceTesting/scripts-ui/resources/.gitkeep b/plugins/performanceTesting/scripts-ui/resources/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/plugins/performanceTesting/scripts-ui/src/.gitkeep b/plugins/performanceTesting/scripts-ui/src/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1