diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 24443aaeac43..66bb303c8a81 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -198,6 +198,7 @@
     <orderEntry type="module" module-name="intellij.remoteControl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.webSymbols" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.performanceTesting" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.performanceTesting.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.smart.update" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.gradle.analysis" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.html.tools" scope="RUNTIME" />
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
index 2dc719e4e6eb..f5969b29b2e7 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
@@ -207,7 +207,9 @@ object CommunityRepositoryModules {
         "intellij.driver.impl",
         "intellij.driver.client"
       )
-    ))
+    ),
+    pluginAuto(listOf("intellij.performanceTesting.ui"))
+  )
 
   val CONTRIB_REPOSITORY_PLUGINS: List<PluginLayout> = java.util.List.of(
     pluginAuto("intellij.errorProne") { spec ->
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java b/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java
deleted file mode 100644
index 50d7d4baf509..000000000000
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexer.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/* The following code was generated by JFlex 1.7.0 tweaked for IntelliJ platform */
-
-package com.jetbrains.performancePlugin.lang.lexer;
-
-import com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.TokenType;
-import com.intellij.lexer.FlexLexer;
-
-
-/**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.7.0
- * from the specification file <tt>IJPerf.flex</tt>
- */
-class IJPerfLexer implements FlexLexer {
-
-  /** This character denotes the end of file */
-  public static final int YYEOF = -1;
-
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
-
-  /** lexical states */
-  public static final int YYINITIAL = 0;
-  public static final int WAITING_INPUT = 2;
-  public static final int WAITING_TEXT = 4;
-  public static final int WAITING_LAST_OPTION = 6;
-
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1,  1,  2,  2,  3, 3
-  };
-
-  /** 
-   * Translates characters to character classes
-   * Chosen bits are [12, 6, 3]
-   * Total runtime size is 15696 bytes
-   */
-  public static int ZZ_CMAP(int ch) {
-    return ZZ_CMAP_A[(ZZ_CMAP_Y[(ZZ_CMAP_Z[ch>>9]<<6)|((ch>>3)&0x3f)]<<3)|(ch&0x7)];
-  }
-
-  /* The ZZ_CMAP_Z table has 2176 entries */
-  static final char ZZ_CMAP_Z[] = zzUnpackCMap(
-    "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1"+
-    "\20\5\21\1\22\1\23\1\24\1\21\14\25\1\26\50\25\1\27\2\25\1\30\1\31\1\32\1\33"+
-    "\25\25\1\34\20\21\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\47\1"+
-    "\21\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\21\1\25\1\57\1\60\5\21\2\25\1\61"+
-    "\7\21\1\25\1\62\20\21\1\25\1\63\1\21\1\64\13\25\1\65\1\25\1\66\22\21\1\67"+
-    "\1\70\4\21\1\71\11\21\1\72\1\73\1\74\1\75\1\21\1\76\2\21\1\77\3\21\1\100\2"+
-    "\21\1\101\10\21\123\25\1\102\7\25\1\103\1\104\12\25\1\105\15\25\1\106\6\21"+
-    "\1\25\1\107\u0582\21\1\110\u017f\21");
-
-  /* The ZZ_CMAP_Y table has 4672 entries */
-  static final char ZZ_CMAP_Y[] = zzUnpackCMap(
-    "\1\0\1\1\1\0\1\2\1\3\1\4\1\5\1\6\1\7\2\0\1\10\1\7\2\0\1\11\1\12\3\0\1\13\1"+
-    "\14\1\15\1\16\2\0\1\17\3\0\1\17\71\0\1\20\1\0\1\21\1\22\1\23\1\24\2\22\16"+
-    "\0\1\25\1\26\1\27\1\30\2\0\1\31\11\0\1\32\21\0\1\31\1\33\24\0\1\7\3\0\1\17"+
-    "\1\34\1\7\4\0\1\35\1\7\4\0\1\32\1\36\1\22\3\0\2\37\1\22\1\40\1\41\1\0\1\42"+
-    "\10\0\1\5\1\43\14\0\1\44\1\32\1\0\1\45\1\5\1\46\1\22\1\35\7\0\1\47\14\0\1"+
-    "\21\1\22\1\5\1\50\4\0\1\40\1\16\5\0\1\40\2\22\3\0\1\2\1\0\1\37\6\22\2\0\1"+
-    "\25\1\40\2\22\1\51\21\0\1\52\1\5\1\7\1\0\1\44\1\53\1\54\2\0\1\45\1\55\1\56"+
-    "\1\53\1\57\1\35\1\60\1\52\1\5\1\2\1\61\1\62\1\63\1\54\2\0\1\45\1\64\1\65\1"+
-    "\63\1\66\1\34\1\67\1\70\1\5\1\40\1\22\1\62\1\32\1\31\2\0\1\45\1\71\1\56\1"+
-    "\32\1\72\1\73\1\22\1\52\1\5\1\34\1\7\1\62\1\53\1\54\2\0\1\45\1\71\1\56\1\53"+
-    "\1\66\1\74\1\60\1\52\1\5\1\34\1\22\1\75\1\76\1\77\1\100\1\61\1\76\1\0\1\20"+
-    "\1\76\1\77\1\101\1\22\1\70\1\5\1\22\1\34\1\44\1\25\1\45\2\0\1\45\1\0\1\102"+
-    "\1\25\1\77\1\103\1\37\1\52\1\5\2\22\1\44\1\25\1\45\2\0\1\45\1\44\1\56\1\25"+
-    "\1\77\1\103\1\27\1\52\1\5\1\104\1\22\1\44\1\25\1\45\5\0\1\25\1\105\1\51\1"+
-    "\35\1\52\1\5\1\22\1\33\1\75\1\0\1\17\1\33\2\0\1\31\1\106\1\17\1\107\1\110"+
-    "\1\0\1\70\1\5\1\111\1\22\1\7\6\0\1\63\1\0\1\17\1\5\1\112\4\22\1\113\1\114"+
-    "\1\51\1\7\1\115\1\75\1\0\1\72\1\110\1\40\1\5\1\116\4\22\1\73\2\22\1\21\1\5"+
-    "\1\112\1\117\1\120\1\0\1\7\3\0\1\23\1\7\1\0\1\25\2\0\1\7\3\0\1\23\1\27\7\22"+
-    "\10\0\1\5\1\112\10\0\1\5\1\121\4\0\1\32\1\15\5\0\1\122\51\0\1\77\1\17\1\77"+
-    "\5\0\1\77\4\0\1\77\1\17\1\77\1\0\1\17\7\0\1\77\10\0\1\47\4\22\2\0\2\22\12"+
-    "\0\2\40\1\7\114\0\1\53\2\0\1\7\2\0\1\37\11\0\1\76\1\0\1\73\1\0\1\25\1\23\1"+
-    "\22\2\0\1\23\1\22\2\0\1\2\1\22\1\0\1\25\1\123\1\22\12\0\1\124\1\125\1\5\1"+
-    "\112\3\22\1\126\1\5\1\112\13\0\1\22\5\0\1\37\10\0\1\40\1\22\3\0\1\17\1\0\1"+
-    "\2\1\0\1\2\1\70\1\5\3\0\1\40\1\23\1\22\5\0\1\2\3\0\1\21\1\5\1\112\4\22\3\0"+
-    "\1\2\7\0\1\17\3\0\1\53\1\5\1\112\1\5\1\112\1\35\1\22\1\0\1\40\10\22\11\0\1"+
-    "\2\1\5\1\112\1\22\1\127\1\2\1\22\6\0\1\5\1\50\6\0\1\2\1\22\7\0\1\22\1\5\1"+
-    "\130\1\5\1\50\3\0\1\40\1\0\1\73\10\22\1\122\4\0\1\21\37\0\1\31\42\0\2\40\4"+
-    "\0\2\40\1\0\1\131\3\0\1\40\6\0\1\25\1\110\1\132\1\23\1\133\1\2\1\0\1\23\1"+
-    "\132\1\23\1\22\1\127\3\22\1\134\1\22\1\35\1\73\1\22\1\135\1\22\1\25\1\0\1"+
-    "\34\1\35\2\22\1\0\1\23\4\0\2\22\1\0\1\23\1\136\1\0\1\73\1\22\1\107\1\33\1"+
-    "\106\1\137\1\24\1\140\1\0\1\56\1\141\1\142\2\22\5\0\1\73\116\22\5\0\1\17\5"+
-    "\0\1\17\20\0\1\23\1\127\1\2\1\22\4\0\1\32\1\15\7\0\1\35\1\22\1\35\2\0\1\17"+
-    "\1\22\10\17\4\0\5\22\1\35\72\22\1\141\3\22\1\7\1\0\1\137\1\23\1\7\11\0\1\17"+
-    "\1\143\1\7\12\0\1\122\1\141\4\0\1\17\1\7\12\0\1\17\2\22\3\0\1\37\6\22\170"+
-    "\0\1\40\11\22\75\0\1\37\2\22\21\0\1\23\10\22\5\0\1\40\41\0\1\23\2\0\1\5\1"+
-    "\144\2\22\6\0\1\51\1\32\16\0\1\21\3\22\1\35\1\0\1\33\14\0\1\54\3\0\1\17\1"+
-    "\0\7\22\1\35\6\0\2\22\1\73\6\0\1\2\1\22\10\0\1\40\1\22\1\5\1\112\3\0\1\145"+
-    "\1\5\1\50\3\0\1\40\4\0\1\2\1\22\3\0\1\23\10\0\1\73\1\35\1\5\1\112\2\0\1\5"+
-    "\1\146\6\0\1\17\1\22\1\0\1\40\1\5\1\112\2\0\1\17\1\33\10\0\1\37\2\22\1\125"+
-    "\2\0\1\147\1\22\3\150\1\22\2\17\5\0\1\122\1\40\1\22\17\0\1\151\1\5\1\112\64"+
-    "\0\1\2\1\22\2\0\1\17\1\127\5\0\1\2\40\22\55\0\1\40\15\0\1\21\4\22\1\17\1\22"+
-    "\1\127\1\141\1\0\1\45\1\17\1\110\1\152\15\0\1\21\3\22\1\127\54\0\1\40\2\22"+
-    "\10\0\1\33\6\0\5\22\1\0\1\23\2\0\2\22\2\0\1\61\2\22\1\141\3\22\1\34\1\25\20"+
-    "\0\1\53\1\135\1\22\1\5\1\112\1\7\2\0\1\63\1\7\2\0\1\37\1\74\12\0\1\17\3\33"+
-    "\1\153\1\154\2\22\1\155\1\0\1\44\2\0\1\17\2\0\1\156\1\0\1\40\1\0\1\40\4\22"+
-    "\17\0\1\37\10\22\6\0\1\23\20\22\1\15\20\22\3\0\1\23\6\0\1\73\1\22\1\73\3\22"+
-    "\4\0\1\22\1\141\3\0\1\37\5\0\1\37\3\0\1\40\4\0\1\2\1\0\1\137\5\22\23\0\1\40"+
-    "\1\5\1\112\4\0\1\2\4\0\1\2\5\0\1\22\6\0\1\2\23\22\46\0\1\17\1\22\2\0\1\40"+
-    "\1\22\1\0\23\22\1\40\1\45\4\0\1\32\1\157\2\0\1\40\1\22\2\0\1\17\1\22\3\0\1"+
-    "\17\10\22\2\0\1\151\1\22\2\0\1\40\1\22\3\0\1\21\10\22\7\0\1\74\10\22\1\160"+
-    "\1\51\1\44\1\7\2\0\1\2\1\63\4\22\3\0\1\23\3\0\1\23\4\22\1\0\1\7\2\0\1\17\3"+
-    "\22\6\0\1\40\1\22\2\0\1\40\1\22\2\0\1\37\1\22\2\0\1\21\15\22\11\0\1\73\6\22"+
-    "\6\0\1\37\1\22\6\0\1\37\41\22\10\0\1\17\3\22\1\70\1\5\1\22\1\35\7\0\1\161"+
-    "\2\22\3\0\1\73\1\5\1\112\6\0\1\162\1\5\2\22\4\0\1\163\1\22\10\0\1\23\1\153"+
-    "\1\5\1\164\4\22\2\0\1\31\4\0\1\27\10\22\1\17\1\140\1\0\1\32\1\0\1\73\7\0\1"+
-    "\37\1\5\1\112\1\44\1\53\1\54\2\0\1\45\1\71\1\56\1\53\1\66\1\101\1\141\1\133"+
-    "\2\23\21\22\11\0\1\37\1\5\1\112\4\22\10\0\1\32\1\22\1\5\1\112\24\22\6\0\1"+
-    "\40\1\0\1\73\2\22\1\40\4\22\10\0\1\165\1\22\1\5\1\112\4\22\7\0\1\22\1\5\1"+
-    "\112\6\22\3\0\1\102\1\0\1\2\1\5\1\112\54\22\10\0\1\5\1\112\1\22\1\35\40\22"+
-    "\7\0\1\17\1\35\1\22\6\0\1\133\2\0\1\21\4\22\7\0\1\73\40\22\1\0\1\45\4\0\1"+
-    "\17\1\0\1\73\1\22\1\5\1\112\2\22\1\33\3\0\1\33\2\0\1\7\1\17\11\22\1\17\1\31"+
-    "\4\0\1\17\1\166\1\0\1\22\1\0\1\21\24\22\63\0\1\21\14\22\15\0\1\17\2\22\30"+
-    "\0\1\2\27\22\5\0\1\17\72\22\10\0\1\17\67\22\7\0\1\73\3\0\1\17\1\5\1\112\14"+
-    "\22\3\0\1\40\1\23\1\22\6\0\1\17\1\22\1\2\1\22\1\5\1\112\1\127\2\0\1\141\2"+
-    "\0\56\22\10\0\1\23\1\22\5\0\1\17\1\22\1\35\2\0\10\22\1\21\3\22\75\0\1\23\2"+
-    "\22\36\0\1\37\41\22\43\0\1\17\12\22\61\0\1\2\40\22\15\0\1\37\1\0\1\23\1\0"+
-    "\1\73\1\0\1\154\1\2\127\22\1\141\1\102\2\0\1\47\1\2\3\22\1\13\22\22\1\153"+
-    "\67\22\12\0\1\25\10\0\1\25\1\167\1\170\1\0\1\171\1\44\7\0\1\32\1\47\2\25\3"+
-    "\0\1\172\1\110\1\33\1\45\51\0\1\40\3\0\1\45\2\0\1\122\3\0\1\122\2\0\1\25\3"+
-    "\0\1\25\2\0\1\17\3\0\1\17\3\0\1\45\3\0\1\45\2\0\1\122\1\52\6\5\6\0\1\17\1"+
-    "\127\5\0\1\23\1\15\1\22\1\135\2\22\1\127\1\7\1\0\52\22\1\17\2\0\1\54\1\152"+
-    "\1\37\72\22\30\0\1\23\1\22\1\17\5\22\11\0\1\37\1\5\1\112\24\22\1\44\3\0\1"+
-    "\113\1\7\1\122\1\173\1\107\1\174\1\113\1\131\1\113\2\122\1\67\1\0\1\31\1\0"+
-    "\1\2\1\62\1\31\1\0\1\2\50\22\32\0\1\17\5\22\106\0\1\23\1\22\33\0\1\40\120"+
-    "\0\1\21\1\22\146\0\1\73\3\22\3\0\1\40\74\22\1\34\3\22\14\0\20\22\36\0\2\22");
-
-  /* The ZZ_CMAP_A table has 1000 entries */
-  static final char ZZ_CMAP_A[] = zzUnpackCMap(
-    "\11\14\1\4\1\2\1\1\1\5\1\3\6\14\4\0\1\4\1\0\1\12\1\0\1\14\1\6\6\0\1\10\1\17"+
-    "\1\22\1\20\12\21\1\16\2\0\1\7\3\0\12\14\1\0\1\13\2\0\4\14\1\0\1\11\2\0\6\14"+
-    "\1\15\2\14\2\0\4\14\4\0\1\14\2\0\1\14\7\0\1\14\4\0\1\14\5\0\7\14\1\0\2\14"+
-    "\4\0\4\14\16\0\5\14\7\0\1\14\1\0\1\14\1\0\5\14\1\0\2\14\2\0\4\14\1\0\1\14"+
-    "\6\0\1\14\1\0\3\14\1\0\1\14\1\0\4\14\1\0\13\14\1\0\1\14\2\0\6\14\1\0\1\14"+
-    "\15\0\1\14\1\0\2\14\1\0\2\14\1\0\4\14\5\0\6\14\5\0\1\14\4\0\3\14\1\0\1\14"+
-    "\3\0\2\21\4\0\6\14\1\0\4\14\1\0\6\14\2\21\3\14\2\0\4\14\2\0\3\14\2\21\6\14"+
-    "\4\0\10\14\2\0\2\21\5\14\2\0\2\14\2\0\6\14\1\0\1\14\3\0\4\14\2\0\5\14\2\0"+
-    "\4\14\5\0\2\14\1\0\1\14\3\0\2\14\4\0\3\14\1\0\6\14\4\0\2\14\1\0\2\14\1\0\2"+
-    "\14\1\0\2\14\2\0\1\14\1\0\3\14\2\0\3\14\3\0\4\14\1\0\1\14\7\0\2\21\1\14\1"+
-    "\0\2\14\1\0\5\14\1\0\3\14\2\0\1\14\15\0\2\14\2\0\2\14\1\0\6\14\3\0\3\14\1"+
-    "\0\4\14\3\0\2\14\1\0\1\14\1\0\3\14\6\0\3\14\3\0\3\14\5\0\2\14\2\0\2\14\5\0"+
-    "\1\14\1\0\5\14\1\0\4\14\1\0\1\14\4\0\1\14\4\0\6\14\1\0\1\14\3\0\2\14\4\0\2"+
-    "\21\7\0\2\14\1\0\1\14\2\0\2\14\1\0\1\14\2\0\1\14\3\0\3\14\1\0\1\14\1\0\1\14"+
-    "\2\21\2\0\4\14\5\0\1\14\1\0\1\14\1\0\1\14\4\0\2\14\2\21\4\14\2\0\3\14\1\0"+
-    "\5\14\1\0\2\14\4\0\4\14\3\0\1\14\3\0\3\14\5\0\4\14\4\0\5\14\2\21\3\0\3\14"+
-    "\1\0\1\14\1\0\1\14\1\0\1\14\1\0\1\14\2\0\3\14\1\0\6\14\2\0\2\14\2\1\5\14\5"+
-    "\0\1\14\4\0\1\14\3\0\3\14\1\0\5\14\2\0\1\14\1\0\4\14\1\0\1\14\5\0\5\14\4\0"+
-    "\1\14\2\0\2\14\2\0\3\14\2\21\2\14\7\0\1\14\1\0\1\14\2\0\2\21\5\14\3\0\5\14"+
-    "\2\0\6\14\1\0\3\14\1\0\2\14\2\0\2\14\1\0\2\14\1\0\2\14\2\0\3\14\3\0\2\14\3"+
-    "\0\2\14\2\0\3\14\4\0\3\14\1\0\2\14\1\0\2\14\3\0\1\14\2\0\5\14\1\0\2\14\1\0"+
-    "\3\14\2\0\1\14\2\0\5\14\1\0\2\21\4\14\2\0\1\14\1\0\2\21\1\14\1\0\1\14\3\0"+
-    "\1\14\3\0\1\14\5\0\1\14\1\0\2\14\1\0\1\14\2\0\1\14\2\0\2\14\2\0\4\14\1\0\4"+
-    "\14\1\0\1\14\1\0\5\14\1\0\4\14\2\0\1\14\1\0\1\14\5\0\1\14\1\0\1\14\1\0\3\14");
-
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
-
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\4\0\2\1\1\2\2\3\1\4\1\2\1\5\1\3"+
-    "\1\6\1\4\1\2\1\4\1\7\2\10\1\4\1\11"+
-    "\1\12\1\11\1\13\1\4\1\0\1\4\4\0\1\6"+
-    "\1\4\1\0\1\4\2\2\1\14\3\0\2\4";
-
-  private static int [] zzUnpackAction() {
-    int [] result = new int[44];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\23\0\46\0\71\0\114\0\137\0\162\0\205"+
-    "\0\230\0\253\0\276\0\321\0\344\0\367\0\u010a\0\u011d"+
-    "\0\u0130\0\u0143\0\u0156\0\46\0\u0169\0\u017c\0\230\0\230"+
-    "\0\230\0\u018f\0\u01a2\0\276\0\u01b5\0\u01c8\0\u01db\0\344"+
-    "\0\u01ee\0\u0201\0\u0214\0\u011d\0\u0169\0\u018f\0\u0227\0\u023a"+
-    "\0\u024d\0\u0260\0\u0273\0\u0286";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[44];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
-    }
-    return j;
-  }
-
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
-
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\5\1\6\1\7\1\6\2\7\1\10\5\11\1\5"+
-    "\1\6\1\11\1\5\2\11\1\5\1\12\1\13\1\7"+
-    "\1\13\1\14\1\7\4\11\1\15\1\16\1\17\1\20"+
-    "\1\11\1\21\1\16\1\22\1\21\1\23\1\24\1\7"+
-    "\3\24\7\23\1\24\5\23\1\12\1\25\1\7\1\25"+
-    "\1\26\1\7\1\11\1\27\1\30\1\31\1\15\1\16"+
-    "\1\17\1\32\1\11\1\21\1\16\1\22\1\21\2\5"+
-    "\1\0\1\5\6\0\1\5\1\0\2\5\1\0\1\5"+
-    "\1\0\1\5\1\0\1\5\1\6\1\7\1\6\2\7"+
-    "\4\0\1\5\1\0\1\5\1\6\1\0\1\5\1\0"+
-    "\1\5\2\0\5\7\7\0\1\7\5\0\2\5\1\0"+
-    "\1\5\2\0\1\33\5\0\2\5\1\0\1\5\2\0"+
-    "\1\5\23\0\2\12\1\0\1\12\6\0\1\12\1\0"+
-    "\2\12\1\0\1\12\1\0\1\12\1\0\1\12\1\34"+
-    "\1\7\1\34\2\7\4\0\1\12\1\0\1\12\1\34"+
-    "\1\0\1\12\1\0\1\12\2\0\3\7\1\14\1\7"+
-    "\7\0\1\7\11\0\1\35\6\0\1\36\2\37\1\0"+
-    "\2\35\1\37\1\35\12\0\1\40\1\16\2\41\1\0"+
-    "\2\16\1\41\1\16\2\12\1\0\1\12\6\0\1\42"+
-    "\1\41\2\17\1\43\1\21\1\41\1\17\1\16\1\12"+
-    "\1\34\1\7\1\34\2\7\4\0\1\42\1\41\1\17"+
-    "\1\44\1\43\1\21\1\41\1\17\1\16\2\12\1\0"+
-    "\1\12\6\0\1\42\1\16\2\17\1\0\1\21\1\16"+
-    "\1\17\1\16\12\0\1\40\3\41\1\43\1\16\1\41"+
-    "\1\22\1\16\2\23\1\0\20\23\1\12\1\45\1\7"+
-    "\1\45\2\7\4\0\1\12\1\0\1\12\1\45\1\0"+
-    "\1\12\1\0\1\12\2\0\3\7\1\26\1\7\7\0"+
-    "\1\7\5\0\1\12\1\45\1\7\1\45\2\7\4\0"+
-    "\1\42\1\41\1\17\1\46\1\43\1\21\1\41\1\17"+
-    "\1\16\2\5\1\0\1\5\3\0\1\47\4\0\2\5"+
-    "\1\0\1\5\2\0\1\5\4\0\1\35\5\0\1\16"+
-    "\3\35\1\0\4\35\4\0\1\35\5\0\1\16\1\50"+
-    "\2\35\1\0\4\35\4\0\1\35\5\0\1\16\1\51"+
-    "\2\37\1\52\1\35\1\51\1\37\1\35\12\0\1\40"+
-    "\3\41\1\43\1\16\2\41\1\16\2\12\1\0\1\12"+
-    "\1\35\5\0\1\12\1\36\2\53\1\0\1\54\1\35"+
-    "\1\53\1\35\13\0\1\41\2\16\1\43\1\16\1\41"+
-    "\2\16\2\47\2\0\17\47\4\0\1\35\5\0\1\16"+
-    "\1\35\2\37\1\0\2\35\1\37\1\35\4\0\1\35"+
-    "\5\0\1\16\1\51\2\35\1\52\1\35\1\51\2\35"+
-    "\4\0\1\35\6\0\1\51\2\35\1\52\1\35\1\51"+
-    "\2\35\2\12\1\0\1\12\1\35\5\0\1\21\1\51"+
-    "\2\53\1\52\1\54\1\51\1\53\1\35\2\12\1\0"+
-    "\1\12\1\35\5\0\1\21\1\35\2\54\1\0\1\54"+
-    "\1\35\1\54\1\35";
-
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[665];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-
-  /* error messages for the codes above */
-  private static final String[] ZZ_ERROR_MSG = {
-    "Unknown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\4\0\4\1\1\11\15\1\3\11\1\1\1\0\1\1"+
-    "\4\0\2\1\1\0\4\1\3\0\2\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[44];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
-    }
-    return j;
-  }
-
-  /** the input device */
-  private java.io.Reader zzReader;
-
-  /** the current state of the DFA */
-  private int zzState;
-
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
-
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private CharSequence zzBuffer = "";
-
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
-
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
-
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
-
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
-
-  /**
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
-
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
-
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-
-
-  /**
-   * Creates a new scanner
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  IJPerfLexer(java.io.Reader in) {
-    this.zzReader = in;
-  }
-
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    int size = 0;
-    for (int i = 0, length = packed.length(); i < length; i += 2) {
-      size += packed.charAt(i);
-    }
-    char[] map = new char[size];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < packed.length()) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-  public final int getTokenStart() {
-    return zzStartRead;
-  }
-
-  public final int getTokenEnd() {
-    return getTokenStart() + yylength();
-  }
-
-  public void reset(CharSequence buffer, int start, int end, int initialState) {
-    zzBuffer = buffer;
-    zzCurrentPos = zzMarkedPos = zzStartRead = start;
-    zzAtEOF  = false;
-    zzAtBOL = true;
-    zzEndRead = end;
-    yybegin(initialState);
-  }
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return      {@code false}, iff there was new input.
-   *
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-    return true;
-  }
-
-
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final CharSequence yytext() {
-    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
-  }
-
-
-  /**
-   * Returns the character at position {@code pos} from the
-   * matched text.
-   *
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch.
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer.charAt(zzStartRead+pos);
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occurred while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of
-   * yypushback(int) and a match-all fallback rule) this method
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
-    }
-
-    throw new Error(message);
-  }
-
-
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
-
-    zzMarkedPos -= number;
-  }
-
-
-  /**
-   * Contains user EOF-code, which will be executed exactly once,
-   * when the end of file is reached
-   */
-  private void zzDoEOF() {
-    if (!zzEOFDone) {
-      zzEOFDone = true;
-    
-    }
-  }
-
-
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public IElementType advance() throws java.io.IOException {
-    int zzInput;
-    int zzAction;
-
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    CharSequence zzBufferL = zzBuffer;
-
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
-
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
-
-      zzAction = -1;
-
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-
-      zzState = ZZ_LEXSTATE[zzLexicalState];
-
-      // set up zzAction for empty match case:
-      int zzAttributes = zzAttrL[zzState];
-      if ( (zzAttributes & 1) == 1 ) {
-        zzAction = zzState;
-      }
-
-
-      zzForAction: {
-        while (true) {
-
-          if (zzCurrentPosL < zzEndReadL) {
-            zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL/*, zzEndReadL*/);
-            zzCurrentPosL += Character.charCount(zzInput);
-          }
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL/*, zzEndReadL*/);
-              zzCurrentPosL += Character.charCount(zzInput);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + ZZ_CMAP(zzInput) ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
-
-          zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
-
-        }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-        zzAtEOF = true;
-        zzDoEOF();
-        return null;
-      }
-      else {
-        switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-          case 1: 
-            { yybegin(WAITING_INPUT); return IJPerfElementTypes.COMMAND;
-            } 
-            // fall through
-          case 13: break;
-          case 2: 
-            { yybegin(YYINITIAL); return TokenType.WHITE_SPACE;
-            } 
-            // fall through
-          case 14: break;
-          case 3: 
-            { return TokenType.BAD_CHARACTER;
-            } 
-            // fall through
-          case 15: break;
-          case 4: 
-            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.IDENTIFIER;
-            } 
-            // fall through
-          case 16: break;
-          case 5: 
-            { yybegin(WAITING_LAST_OPTION); return TokenType.WHITE_SPACE;
-            } 
-            // fall through
-          case 17: break;
-          case 6: 
-            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.FILE_PATH;
-            } 
-            // fall through
-          case 18: break;
-          case 7: 
-            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.NUMBER;
-            } 
-            // fall through
-          case 19: break;
-          case 8: 
-            { yybegin(YYINITIAL); return IJPerfElementTypes.TEXT;
-            } 
-            // fall through
-          case 20: break;
-          case 9: 
-            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.OPTIONS_SEPARATOR;
-            } 
-            // fall through
-          case 21: break;
-          case 10: 
-            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.ASSIGNMENT_OPERATOR;
-            } 
-            // fall through
-          case 22: break;
-          case 11: 
-            { yybegin(WAITING_TEXT); return IJPerfElementTypes.PIPE;
-            } 
-            // fall through
-          case 23: break;
-          case 12: 
-            { yybegin(YYINITIAL); return IJPerfElementTypes.COMMENT;
-            } 
-            // fall through
-          case 24: break;
-          default:
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
-    }
-  }
-
-
-}
diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml
index 72982dd778a1..0e8b4d76b780 100644
--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
diff --git a/plugins/performanceTesting/core/resources/META-INF/plugin.xml b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
index ee0c5b9105f0..6d9d6c4ddead 100644
--- a/plugins/performanceTesting/core/resources/META-INF/plugin.xml
+++ b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
@@ -30,7 +30,6 @@
     <group id="DiagnosticGroup">
       <separator/>
       <action id="CaptureMemorySnapShot" class="com.jetbrains.performancePlugin.actions.CaptureMemorySnapshotAction" icon="AllIcons.Actions.ProfileMemory"/>
-      <action class="com.jetbrains.performancePlugin.actions.ExecuteScriptAction" id="performancePlugin.ExecuteScriptAction"/>
       <separator/>
       <add-to-group group-id="HelpDiagnosticTools" anchor="last"/>
     </group>
@@ -48,21 +47,6 @@
     <troubleInfoCollector implementation="com.jetbrains.performancePlugin.PerformanceTroubleInfoCollector"/>
     <troubleInfoCollector implementation="com.jetbrains.performancePlugin.utils.HardwareCollector"/>
 
-    <fileType name="IntegrationPerformanceTest"
-              implementationClass="com.jetbrains.performancePlugin.lang.IJPerfFileType"
-              fieldName="INSTANCE" language="IntegrationPerformanceTest" extensions="ijperf"/>
-
-    <lang.parserDefinition language="IntegrationPerformanceTest"
-                           implementationClass="com.jetbrains.performancePlugin.lang.IJPerfParserDefinition"/>
-
-    <lang.syntaxHighlighterFactory language="IntegrationPerformanceTest"
-                                   implementationClass="com.jetbrains.performancePlugin.lang.IJPerfSyntaxHighlighterFactory"/>
-
-    <completion.contributor language="IntegrationPerformanceTest"
-                            implementationClass="com.jetbrains.performancePlugin.lang.completion.IJPerfCompletionContributor"/>
-
-    <annotator language="IntegrationPerformanceTest" implementationClass="com.jetbrains.performancePlugin.lang.inspections.IJPerfStartStopProfileInspection"/>
-
     <initProjectActivity implementation="com.jetbrains.performancePlugin.PerformancePluginInitProjectActivity"/>
     <postStartupActivity implementation="com.jetbrains.performancePlugin.PerformanceTestTotalTimeTimer" />
     <applicationInitializedListener implementation="com.jetbrains.performancePlugin.ProjectLoaded"/>
diff --git a/plugins/performanceTesting/core/resources/messages/PerformanceTestingBundle.properties b/plugins/performanceTesting/core/resources/messages/PerformanceTestingBundle.properties
index 853940f7bf76..add0a5ada225 100644
--- a/plugins/performanceTesting/core/resources/messages/PerformanceTestingBundle.properties
+++ b/plugins/performanceTesting/core/resources/messages/PerformanceTestingBundle.properties
@@ -37,12 +37,6 @@ delay.notification.message=Total time: {0} ms \n Average delay: {1} ms Max delay
 
 command.singleInspection.noinspection=Cannot run inspection, inspection doesn''t exists {0}
 
-select.scenario=Please select &scenario:
-executor.title=Performance Issue Reporter
-execute.script.button=&Execute
-typing.scenario=Typing
-formatting.scenario=Formatting
-local.inspection.scenario=Local Inspection
 input.below.parameters.for.async.profiler=Input below parameters for async profiler
 
 action.performancePlugin.ExecuteScriptAction.text=Execute Performance Script\u2026
@@ -65,9 +59,6 @@ compare.indexes.resolving.files=Resolving files for comparison\u2026
 compare.indexes.preparing.indexes=Preparing indexes\u2026
 button.text.cancel=Not Now
 
-filetype.ijperformance.test.description=Script of integration performance test
-filetype.ijperformance.test.display.name=ijperf script
-
 task.title.executing.performance.script=Executing performance script
 
 dumping.project.files=Dumping Project Files\u2026
@@ -77,8 +68,4 @@ comparing.project.files.for.0=Comparing Project Files for {0}\u2026
 action.CaptureMemorySnapShot.text=Capture Memory Snapshot
 action.CaptureMemorySnapShot.description=Capture memory snapshot
 
-intention.add.stopcommand=Add `%stopProfile` command
-inspection.message.activity.started.but.never.closed.with.stopprofile=`{0}` activity started, but never closed with `%stopProfile`
-inspection.message.two.startprofile.commands.cant.follow.each.other=`%startProfile` commands can''t follow each other. Add `%stopProfile` before `{0}`
 notification.group.performance.plugin=IDE self-profiling
-
diff --git a/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/lexer/IJPerfLexer.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/lexer/IJPerfLexer.java
new file mode 100644
index 000000000000..7ca60987f335
--- /dev/null
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/lexer/IJPerfLexer.java
@@ -0,0 +1,866 @@
+// Generated by JFlex 1.9.1 http://jflex.de/  (tweaked for IntelliJ platform)
+// source: IJPerf.flex
+
+package com.jetbrains.performanceScripts.lang.lexer;
+
+import com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.TokenType;
+import com.intellij.lexer.FlexLexer;
+
+
+class IJPerfLexer implements FlexLexer {
+
+  /** This character denotes the end of file */
+  public static final int YYEOF = -1;
+
+  /** initial size of the lookahead buffer */
+  private static final int ZZ_BUFFERSIZE = 16384;
+
+  /** lexical states */
+  public static final int YYINITIAL = 0;
+  public static final int WAITING_INPUT = 2;
+  public static final int WAITING_TEXT = 4;
+  public static final int WAITING_LAST_OPTION = 6;
+
+  /**
+   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+   *                  at the beginning of a line
+   * l is of the form l = 2*k, k a non negative integer
+   */
+  private static final int ZZ_LEXSTATE[] = {
+     0,  0,  1,  1,  2,  2,  3, 3
+  };
+
+  /**
+   * Top-level table for translating characters to character classes
+   */
+  private static final int [] ZZ_CMAP_TOP = zzUnpackcmap_top();
+
+  private static final String ZZ_CMAP_TOP_PACKED_0 =
+    "\1\0\1\u0100\1\u0200\1\u0300\1\u0400\1\u0500\1\u0600\1\u0700"+
+    "\1\u0800\1\u0900\1\u0a00\1\u0b00\1\u0c00\1\u0d00\1\u0e00\1\u0f00"+
+    "\1\u1000\1\u0100\1\u1100\1\u1200\1\u1300\1\u0100\1\u1400\1\u1500"+
+    "\1\u1600\1\u1700\1\u1800\1\u1900\1\u1a00\2\u0100\1\u1b00\1\u1c00"+
+    "\1\u1d00\12\u1e00\1\u1f00\1\u2000\1\u2100\1\u1e00\1\u2200\1\u2300"+
+    "\2\u1e00\31\u0100\1\u2400\126\u0100\1\u2500\1\u0100\1\u2600\1\u2700"+
+    "\1\u2800\1\u2900\1\u2a00\1\u2b00\53\u0100\1\u2c00\41\u1e00\1\u0100"+
+    "\1\u2d00\1\u2e00\1\u0100\1\u2f00\1\u3000\1\u3100\1\u3200\1\u3300"+
+    "\1\u3400\1\u3500\1\u3600\1\u3700\1\u0100\1\u3800\1\u3900\1\u3a00"+
+    "\1\u3b00\1\u3c00\1\u3d00\1\u3e00\1\u3f00\1\u4000\1\u4100\1\u4200"+
+    "\1\u4300\1\u4400\1\u4500\1\u4600\1\u4700\1\u4800\1\u4900\1\u4a00"+
+    "\1\u4b00\1\u1e00\1\u4c00\1\u4d00\1\u4e00\1\u4f00\3\u0100\1\u5000"+
+    "\1\u5100\1\u5200\11\u1e00\1\u5300\4\u0100\1\u5400\17\u1e00\2\u0100"+
+    "\1\u5500\41\u1e00\2\u0100\1\u5600\1\u5700\2\u1e00\1\u5800\1\u5900"+
+    "\27\u0100\1\u5a00\4\u0100\1\u5b00\1\u5c00\41\u1e00\1\u5d00\1\u0100"+
+    "\1\u5e00\1\u5f00\11\u1e00\1\u6000\22\u1e00\1\u6100\1\u1e00\1\u6200"+
+    "\1\u6300\1\u1e00\1\u6400\1\u6500\1\u6600\1\u6700\2\u1e00\1\u6800"+
+    "\4\u1e00\1\u6900\1\u6a00\1\u6b00\1\u6c00\1\u1e00\1\u6d00\2\u1e00"+
+    "\1\u6e00\1\u6f00\1\u7000\2\u1e00\1\u7100\1\u1e00\1\u7200\14\u1e00"+
+    "\1\u7300\4\u1e00\246\u0100\1\u7400\20\u0100\1\u7500\1\u7600\25\u0100"+
+    "\1\u7700\34\u0100\1\u7800\14\u1e00\2\u0100\1\u7900\5\u1e00\23\u0100"+
+    "\1\u7a00\17\u0100\1\u7b00\u0adc\u1e00\1\u7c00\1\u7d00\u02fe\u1e00";
+
+  private static int [] zzUnpackcmap_top() {
+    int [] result = new int[4352];
+    int offset = 0;
+    offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackcmap_top(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /**
+   * Second-level tables for translating characters to character classes
+   */
+  private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
+
+  private static final String ZZ_CMAP_BLOCKS_PACKED_0 =
+    "\11\0\1\1\1\2\1\3\1\4\1\5\16\0\4\6"+
+    "\1\1\1\6\1\7\1\6\1\0\1\10\6\6\1\11"+
+    "\1\12\1\13\1\14\12\15\1\16\2\6\1\17\3\6"+
+    "\32\0\1\6\1\20\2\6\1\0\1\6\32\0\1\6"+
+    "\1\21\2\6\6\0\1\22\32\0\2\6\4\0\4\6"+
+    "\1\0\2\6\1\0\7\6\1\0\4\6\1\0\5\6"+
+    "\27\0\1\6\37\0\1\6\u01ca\0\4\6\14\0\16\6"+
+    "\5\0\7\6\1\0\1\6\1\0\21\6\165\0\1\6"+
+    "\2\0\2\6\4\0\1\6\1\0\6\6\1\0\1\6"+
+    "\3\0\1\6\1\0\1\6\24\0\1\6\123\0\1\6"+
+    "\213\0\1\6\5\0\2\6\246\0\1\6\46\0\2\6"+
+    "\1\0\6\6\51\0\6\6\1\0\1\6\55\0\1\6"+
+    "\1\0\1\6\2\0\1\6\2\0\1\6\1\0\10\6"+
+    "\33\0\4\6\4\0\15\6\6\0\5\6\1\0\4\6"+
+    "\13\0\1\6\1\0\3\6\100\0\12\15\4\6\146\0"+
+    "\1\6\11\0\1\6\12\0\1\6\6\0\12\15\3\0"+
+    "\2\6\1\0\17\6\74\0\2\6\145\0\16\6\12\15"+
+    "\54\0\4\6\1\0\2\6\61\0\22\6\34\0\4\6"+
+    "\13\0\5\6\30\0\1\6\6\0\1\6\2\0\6\6"+
+    "\314\0\2\6\12\15\1\6\23\0\1\6\10\0\2\6"+
+    "\2\0\2\6\26\0\1\6\7\0\1\6\1\0\3\6"+
+    "\4\0\2\6\11\0\2\6\2\0\2\6\4\0\10\6"+
+    "\1\0\4\6\2\0\1\6\5\0\2\6\12\15\4\0"+
+    "\7\6\2\0\1\6\1\0\2\6\3\0\1\6\6\0"+
+    "\4\6\2\0\2\6\26\0\1\6\7\0\1\6\2\0"+
+    "\1\6\2\0\1\6\2\0\2\6\1\0\1\6\5\0"+
+    "\4\6\2\0\2\6\3\0\3\6\1\0\7\6\4\0"+
+    "\1\6\1\0\7\6\12\15\6\0\13\6\3\0\1\6"+
+    "\11\0\1\6\3\0\1\6\26\0\1\6\7\0\1\6"+
+    "\2\0\1\6\5\0\2\6\12\0\1\6\3\0\1\6"+
+    "\3\0\2\6\1\0\17\6\4\0\2\6\12\15\1\6"+
+    "\1\0\7\6\7\0\1\6\3\0\1\6\10\0\2\6"+
+    "\2\0\2\6\26\0\1\6\7\0\1\6\2\0\1\6"+
+    "\5\0\2\6\11\0\2\6\2\0\2\6\3\0\7\6"+
+    "\3\0\4\6\2\0\1\6\5\0\2\6\12\15\1\6"+
+    "\1\0\20\6\2\0\1\6\6\0\3\6\3\0\1\6"+
+    "\4\0\3\6\2\0\1\6\1\0\1\6\2\0\3\6"+
+    "\2\0\3\6\3\0\3\6\14\0\4\6\5\0\3\6"+
+    "\3\0\1\6\4\0\2\6\1\0\6\6\1\0\16\6"+
+    "\12\15\11\6\1\0\6\6\15\0\1\6\3\0\1\6"+
+    "\27\0\1\6\20\0\2\6\11\0\1\6\3\0\1\6"+
+    "\4\0\7\6\2\0\1\6\3\0\2\6\1\0\2\6"+
+    "\4\0\2\6\12\15\20\6\4\0\1\6\10\0\1\6"+
+    "\3\0\1\6\27\0\1\6\12\0\1\6\5\0\2\6"+
+    "\11\0\1\6\3\0\1\6\4\0\7\6\2\0\6\6"+
+    "\2\0\1\6\4\0\2\6\12\15\1\6\3\0\14\6"+
+    "\15\0\1\6\3\0\1\6\63\0\1\6\3\0\1\6"+
+    "\5\0\5\6\4\0\7\6\5\0\2\6\12\15\12\6"+
+    "\6\0\1\6\3\0\1\6\22\0\3\6\30\0\1\6"+
+    "\11\0\1\6\1\0\2\6\7\0\3\6\1\0\4\6"+
+    "\6\0\1\6\1\0\1\6\10\0\6\6\12\15\2\6"+
+    "\2\0\15\6\72\0\4\6\20\0\1\6\12\15\47\6"+
+    "\2\0\1\6\1\0\1\6\5\0\1\6\30\0\1\6"+
+    "\1\0\1\6\27\0\2\6\5\0\1\6\1\0\1\6"+
+    "\7\0\1\6\12\15\2\6\4\0\40\6\1\0\27\6"+
+    "\2\0\6\6\12\15\13\6\1\0\1\6\1\0\1\6"+
+    "\1\0\4\6\12\0\1\6\44\0\4\6\24\0\1\6"+
+    "\22\0\1\6\44\0\11\6\1\0\71\6\100\0\12\15"+
+    "\6\6\100\0\12\15\4\0\2\6\46\0\1\6\1\0"+
+    "\5\6\1\0\2\6\53\0\1\6\115\0\1\6\4\0"+
+    "\2\6\7\0\1\6\1\0\1\6\4\0\2\6\51\0"+
+    "\1\6\4\0\2\6\41\0\1\6\4\0\2\6\7\0"+
+    "\1\6\1\0\1\6\4\0\2\6\17\0\1\6\71\0"+
+    "\1\6\4\0\2\6\103\0\2\6\3\0\40\6\20\0"+
+    "\20\6\126\0\2\6\6\0\3\6\u016c\0\2\6\21\0"+
+    "\1\6\32\0\5\6\113\0\3\6\13\0\7\6\26\0"+
+    "\11\6\26\0\13\6\24\0\14\6\15\0\1\6\3\0"+
+    "\1\6\2\0\14\6\124\0\3\6\1\0\3\6\3\0"+
+    "\2\6\12\15\41\6\5\0\12\15\6\6\131\0\7\6"+
+    "\53\0\5\6\106\0\12\6\37\0\1\6\14\0\4\6"+
+    "\14\0\12\6\12\15\36\0\2\6\5\0\13\6\54\0"+
+    "\4\6\32\0\6\6\12\15\46\6\34\0\4\6\77\0"+
+    "\1\6\35\0\2\6\1\0\12\15\6\6\12\15\15\6"+
+    "\1\0\10\6\16\0\1\6\20\0\61\6\115\0\3\6"+
+    "\12\15\21\6\11\0\14\6\60\0\12\15\72\0\14\6"+
+    "\70\0\10\6\12\15\3\6\3\0\12\15\44\0\2\6"+
+    "\11\0\7\6\53\0\2\6\3\0\20\6\3\0\1\6"+
+    "\47\0\5\6\26\0\2\6\6\0\2\6\46\0\2\6"+
+    "\6\0\2\6\10\0\1\6\1\0\1\6\1\0\1\6"+
+    "\1\0\1\6\37\0\2\6\65\0\1\6\7\0\1\6"+
+    "\1\0\3\6\3\0\1\6\7\0\3\6\4\0\2\6"+
+    "\6\0\4\6\15\0\5\6\3\0\1\6\7\0\16\6"+
+    "\5\0\30\6\2\3\5\0\20\6\2\0\23\6\1\0"+
+    "\13\6\5\0\1\6\12\0\1\6\1\0\15\6\1\0"+
+    "\20\6\15\0\3\6\41\0\17\6\15\0\4\6\1\0"+
+    "\3\6\14\0\21\6\1\0\4\6\1\0\2\6\12\0"+
+    "\1\6\1\0\3\6\5\0\6\6\1\0\1\6\1\0"+
+    "\1\6\1\0\1\6\4\0\1\6\13\0\2\6\4\0"+
+    "\5\6\5\0\4\6\1\0\21\6\51\0\u0177\6\345\0"+
+    "\6\6\11\0\14\6\46\0\1\6\1\0\5\6\1\0"+
+    "\2\6\70\0\7\6\1\0\17\6\30\0\11\6\7\0"+
+    "\1\6\7\0\1\6\7\0\1\6\7\0\1\6\7\0"+
+    "\1\6\7\0\1\6\7\0\1\6\7\0\1\6\40\0"+
+    "\57\6\1\0\325\6\3\0\31\6\17\0\1\6\5\0"+
+    "\2\6\5\0\4\6\126\0\2\6\2\0\2\6\3\0"+
+    "\1\6\132\0\1\6\4\0\5\6\53\0\1\6\136\0"+
+    "\21\6\40\0\60\6\320\0\100\6\215\0\103\6\56\0"+
+    "\2\6\15\0\3\6\20\0\12\15\2\0\24\6\60\0"+
+    "\4\6\12\0\1\6\163\0\45\6\11\0\2\6\147\0"+
+    "\2\6\100\0\5\6\2\0\1\6\1\0\1\6\5\0"+
+    "\30\6\66\0\4\6\1\0\13\6\1\0\7\6\64\0"+
+    "\14\6\106\0\12\6\12\15\6\6\30\0\3\6\1\0"+
+    "\1\6\3\0\12\15\44\0\2\6\44\0\14\6\35\0"+
+    "\3\6\101\0\16\6\1\0\12\15\6\6\20\0\12\15"+
+    "\5\0\1\6\67\0\11\6\16\0\2\6\12\15\6\6"+
+    "\27\0\3\6\111\0\30\6\3\0\2\6\20\0\2\6"+
+    "\5\0\12\6\6\0\2\6\6\0\2\6\6\0\11\6"+
+    "\7\0\1\6\7\0\1\6\53\0\1\6\16\0\6\6"+
+    "\173\0\1\6\2\0\2\6\12\15\6\6\244\0\14\6"+
+    "\27\0\4\6\61\0\4\6\156\0\2\6\152\0\46\6"+
+    "\7\0\14\6\5\0\5\6\14\0\1\6\15\0\1\6"+
+    "\5\0\1\6\1\0\1\6\2\0\1\6\2\0\1\6"+
+    "\154\0\41\6\153\0\22\6\100\0\2\6\66\0\50\6"+
+    "\15\0\3\6\20\0\20\6\20\0\3\6\2\0\30\6"+
+    "\3\0\31\6\1\0\6\6\5\0\1\6\207\0\2\6"+
+    "\1\0\4\6\1\0\13\6\12\15\7\6\32\0\4\6"+
+    "\1\0\1\6\32\0\13\6\131\0\3\6\6\0\2\6"+
+    "\6\0\2\6\6\0\2\6\3\0\3\6\2\0\3\6"+
+    "\2\0\22\6\3\0\4\6\14\0\1\6\32\0\1\6"+
+    "\23\0\1\6\2\0\1\6\17\0\2\6\16\0\42\6"+
+    "\173\0\105\6\65\0\210\6\1\0\202\6\35\0\3\6"+
+    "\61\0\17\6\1\0\37\6\40\0\15\6\36\0\5\6"+
+    "\53\0\5\6\36\0\2\6\44\0\4\6\10\0\1\6"+
+    "\5\0\52\6\236\0\2\6\12\15\6\6\44\0\4\6"+
+    "\44\0\4\6\50\0\10\6\64\0\14\6\13\0\1\6"+
+    "\17\0\1\6\7\0\1\6\2\0\1\6\13\0\1\6"+
+    "\17\0\1\6\7\0\1\6\2\0\103\6\67\0\11\6"+
+    "\26\0\12\6\10\0\30\6\6\0\1\6\52\0\1\6"+
+    "\11\0\105\6\6\0\2\6\1\0\1\6\54\0\1\6"+
+    "\2\0\3\6\1\0\2\6\27\0\12\6\27\0\11\6"+
+    "\37\0\101\6\23\0\1\6\2\0\12\6\26\0\12\6"+
+    "\32\0\106\6\70\0\6\6\2\0\100\6\4\0\1\6"+
+    "\2\0\5\6\10\0\1\6\3\0\1\6\35\0\2\6"+
+    "\3\0\4\6\1\0\40\6\35\0\3\6\35\0\43\6"+
+    "\10\0\1\6\36\0\31\6\66\0\12\6\26\0\12\6"+
+    "\23\0\15\6\22\0\156\6\111\0\67\6\63\0\15\6"+
+    "\63\0\15\6\50\0\10\6\12\15\u0146\6\52\0\1\6"+
+    "\2\0\3\6\2\0\113\6\40\0\12\6\1\0\10\6"+
+    "\41\0\37\6\26\0\52\6\25\0\33\6\27\0\11\6"+
+    "\107\0\37\6\12\15\6\0\11\6\74\0\2\6\1\0"+
+    "\4\6\1\0\12\6\1\0\2\6\31\0\7\6\12\15"+
+    "\6\6\65\0\1\6\12\15\4\6\4\0\10\6\44\0"+
+    "\2\6\1\0\11\6\105\0\4\6\4\0\1\6\2\0"+
+    "\12\15\1\0\1\6\1\0\43\6\22\0\1\6\45\0"+
+    "\6\6\4\0\76\6\7\0\1\6\1\0\1\6\4\0"+
+    "\1\6\17\0\1\6\12\0\7\6\73\0\5\6\12\15"+
+    "\6\6\4\0\1\6\10\0\2\6\2\0\2\6\26\0"+
+    "\1\6\7\0\1\6\2\0\1\6\5\0\1\6\12\0"+
+    "\2\6\2\0\2\6\3\0\2\6\1\0\6\6\1\0"+
+    "\5\6\7\0\2\6\7\0\3\6\5\0\213\6\113\0"+
+    "\5\6\12\15\4\6\4\0\36\6\106\0\1\6\1\0"+
+    "\10\6\12\15\246\6\66\0\2\6\11\0\27\6\6\0"+
+    "\42\6\101\0\3\6\1\0\13\6\12\15\46\6\71\0"+
+    "\7\6\12\15\66\6\33\0\2\6\17\0\4\6\12\15"+
+    "\6\6\7\0\271\6\73\0\145\6\100\0\12\15\25\6"+
+    "\10\0\2\6\1\0\2\6\10\0\1\6\2\0\1\6"+
+    "\36\0\1\6\2\0\2\6\11\0\14\6\12\0\106\6"+
+    "\10\0\2\6\56\0\2\6\10\0\1\6\2\0\33\6"+
+    "\77\0\10\6\1\0\10\6\112\0\3\6\1\0\22\6"+
+    "\111\0\7\6\11\0\1\6\55\0\1\6\11\0\17\6"+
+    "\12\15\30\6\36\0\2\6\26\0\1\6\16\0\111\6"+
+    "\7\0\1\6\2\0\1\6\54\0\3\6\1\0\1\6"+
+    "\2\0\1\6\11\0\10\6\12\15\6\6\6\0\1\6"+
+    "\2\0\1\6\45\0\1\6\2\0\1\6\6\0\7\6"+
+    "\12\15\u0136\6\27\0\11\6\21\0\1\6\51\0\3\6"+
+    "\5\0\15\6\12\0\126\6\1\0\54\6\4\0\37\6"+
+    "\232\0\146\6\157\0\21\6\304\0\u014c\6\141\0\17\6"+
+    "\126\0\252\6\107\0\271\6\71\0\7\6\37\0\1\6"+
+    "\12\15\6\6\117\0\1\6\12\0\6\6\36\0\2\6"+
+    "\5\0\13\6\67\0\11\6\4\0\14\6\12\15\11\6"+
+    "\25\0\5\6\23\0\260\6\100\0\200\6\113\0\4\6"+
+    "\71\0\7\6\21\0\100\6\2\0\1\6\2\0\13\6"+
+    "\2\0\16\6\370\0\10\6\326\0\52\6\11\0\u01e7\6"+
+    "\4\0\1\6\7\0\1\6\2\0\1\6\43\0\17\6"+
+    "\1\0\35\6\3\0\2\6\1\0\16\6\4\0\10\6"+
+    "\u018c\0\4\6\153\0\5\6\15\0\3\6\11\0\7\6"+
+    "\12\0\3\6\2\0\1\6\4\0\134\6\56\0\2\6"+
+    "\27\0\u011e\6\5\0\3\6\26\0\2\6\7\0\36\6"+
+    "\4\0\224\6\3\0\273\6\125\0\1\6\107\0\1\6"+
+    "\2\0\2\6\1\0\2\6\2\0\2\6\4\0\1\6"+
+    "\14\0\1\6\1\0\1\6\7\0\1\6\101\0\1\6"+
+    "\4\0\2\6\10\0\1\6\7\0\1\6\34\0\1\6"+
+    "\4\0\1\6\5\0\1\6\1\0\3\6\7\0\1\6"+
+    "\u0154\0\2\6\31\0\1\6\31\0\1\6\37\0\1\6"+
+    "\31\0\1\6\37\0\1\6\31\0\1\6\37\0\1\6"+
+    "\31\0\1\6\37\0\1\6\31\0\1\6\10\0\2\6"+
+    "\62\15\67\0\4\6\62\0\10\6\1\0\16\6\1\0"+
+    "\26\6\5\0\1\6\17\0\120\6\37\0\6\6\6\0"+
+    "\325\6\7\0\1\6\21\0\2\6\7\0\1\6\2\0"+
+    "\1\6\5\0\5\6\76\0\41\6\1\0\160\6\55\0"+
+    "\3\6\16\0\2\6\12\15\4\6\1\0\u0141\6\37\0"+
+    "\21\6\60\0\12\15\5\6\1\0\320\6\52\0\346\6"+
+    "\7\0\1\6\4\0\1\6\2\0\1\6\17\0\1\6"+
+    "\305\0\13\6\7\0\51\6\114\0\4\6\12\15\u0156\6"+
+    "\1\0\117\6\4\0\1\6\33\0\1\6\2\0\1\6"+
+    "\1\0\2\6\1\0\1\6\12\0\1\6\4\0\1\6"+
+    "\1\0\1\6\1\0\6\6\1\0\4\6\1\0\1\6"+
+    "\1\0\1\6\1\0\1\6\3\0\1\6\2\0\1\6"+
+    "\1\0\2\6\1\0\1\6\1\0\1\6\1\0\1\6"+
+    "\1\0\1\6\1\0\1\6\2\0\1\6\1\0\2\6"+
+    "\4\0\1\6\7\0\1\6\4\0\1\6\4\0\1\6"+
+    "\1\0\1\6\12\0\1\6\21\0\5\6\3\0\1\6"+
+    "\5\0\1\6\21\0\u0134\6\12\0\6\6\340\0\40\6"+
+    "\72\0\6\6\336\0\2\6\u0182\0\16\6\u0131\0\37\6"+
+    "\36\0\342\6\113\0\5\6\u0160\0\121\6\1\0\36\6"+
+    "\140\0\200\6\360\0\20\6";
+
+  private static int [] zzUnpackcmap_blocks() {
+    int [] result = new int[32256];
+    int offset = 0;
+    offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackcmap_blocks(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /**
+   * Translates DFA states to action switch labels.
+   */
+  private static final int [] ZZ_ACTION = zzUnpackAction();
+
+  private static final String ZZ_ACTION_PACKED_0 =
+    "\4\0\1\1\1\2\1\1\2\3\1\4\1\5\1\2"+
+    "\1\4\1\3\1\4\1\6\1\7\1\2\2\10\1\11"+
+    "\1\4\1\11\1\12\1\13\1\4\1\0\1\4\1\6"+
+    "\1\0\1\4\4\0\1\4\2\2\1\14\2\4\3\0";
+
+  private static int [] zzUnpackAction() {
+    int [] result = new int[44];
+    int offset = 0;
+    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAction(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /**
+   * Translates a state to a row index in the transition table
+   */
+  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
+
+  private static final String ZZ_ROWMAP_PACKED_0 =
+    "\0\0\0\23\0\46\0\71\0\114\0\137\0\162\0\205"+
+    "\0\230\0\253\0\276\0\321\0\344\0\367\0\u010a\0\u011d"+
+    "\0\u0130\0\u0143\0\u0156\0\46\0\u0169\0\u017c\0\205\0\205"+
+    "\0\205\0\u018f\0\u01a2\0\u01b5\0\u01c8\0\u01db\0\321\0\u01ee"+
+    "\0\u0201\0\u0214\0\367\0\u0143\0\u017c\0\u018f\0\u0227\0\u023a"+
+    "\0\u024d\0\u0260\0\u0273\0\u0286";
+
+  private static int [] zzUnpackRowMap() {
+    int [] result = new int[44];
+    int offset = 0;
+    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
+    int i = 0;  /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length() - 1;
+    while (i < l) {
+      int high = packed.charAt(i++) << 16;
+      result[j++] = high | packed.charAt(i++);
+    }
+    return j;
+  }
+
+  /**
+   * The transition table of the DFA
+   */
+  private static final int [] ZZ_TRANS = zzUnpacktrans();
+
+  private static final String ZZ_TRANS_PACKED_0 =
+    "\1\5\2\6\1\7\1\6\1\7\1\5\1\10\1\11"+
+    "\1\10\2\5\6\10\1\7\1\12\1\13\1\6\1\14"+
+    "\1\6\1\14\1\15\1\16\2\10\2\17\1\20\1\21"+
+    "\2\10\1\20\1\10\1\22\1\23\1\24\1\6\3\24"+
+    "\14\23\1\24\1\12\1\25\1\6\1\26\1\6\1\26"+
+    "\1\15\1\16\1\10\1\27\2\17\1\20\1\21\1\10"+
+    "\1\30\1\20\1\31\1\32\1\5\2\0\1\5\1\0"+
+    "\3\5\2\0\1\5\2\0\1\5\4\0\1\5\1\0"+
+    "\5\6\14\0\1\6\1\5\2\6\1\7\1\6\1\7"+
+    "\2\5\2\0\1\5\2\0\1\5\4\0\1\7\23\0"+
+    "\1\5\2\0\1\5\1\0\2\5\1\0\1\33\1\0"+
+    "\2\5\6\0\1\5\1\12\2\0\1\15\1\0\2\15"+
+    "\1\34\2\0\1\17\1\20\1\35\1\12\1\36\1\0"+
+    "\1\35\1\0\1\12\1\0\1\13\4\6\14\0\1\6"+
+    "\1\15\2\6\1\37\1\6\1\37\2\15\2\0\1\15"+
+    "\2\0\1\15\4\0\1\37\1\15\2\0\1\15\1\0"+
+    "\3\15\2\0\1\15\2\0\1\15\4\0\1\15\1\40"+
+    "\1\41\10\0\3\41\1\40\2\0\1\42\1\0\1\40"+
+    "\1\12\2\0\1\15\1\0\2\15\1\34\2\0\1\17"+
+    "\2\20\1\12\2\0\1\20\1\0\1\12\1\35\6\0"+
+    "\1\43\2\0\3\20\1\35\2\0\1\20\1\0\2\35"+
+    "\6\0\1\43\2\0\2\20\1\35\1\21\1\36\1\0"+
+    "\1\35\1\0\1\35\1\12\2\6\1\37\1\6\1\37"+
+    "\1\15\1\34\2\0\1\17\1\20\1\35\1\12\1\36"+
+    "\1\0\1\35\1\0\1\44\2\23\1\0\20\23\1\0"+
+    "\1\25\4\6\14\0\1\6\1\15\2\6\1\45\1\6"+
+    "\1\45\2\15\2\0\1\15\2\0\1\15\4\0\1\45"+
+    "\1\12\2\6\1\45\1\6\1\45\1\15\1\34\2\0"+
+    "\1\17\1\20\1\35\1\12\1\36\1\0\1\35\1\0"+
+    "\1\46\1\5\2\0\1\5\1\0\2\5\3\0\2\5"+
+    "\3\0\1\47\2\0\1\5\1\50\1\41\1\0\1\15"+
+    "\1\0\3\15\2\0\1\51\2\41\1\50\2\0\1\42"+
+    "\1\0\1\50\1\35\6\0\1\43\2\0\2\20\2\35"+
+    "\1\36\1\0\1\35\1\0\1\35\1\20\11\0\2\20"+
+    "\1\35\1\20\1\36\1\0\1\35\1\0\1\20\1\40"+
+    "\1\41\5\0\1\20\2\0\2\41\1\52\1\40\1\53"+
+    "\1\0\1\52\1\0\1\40\2\41\5\0\1\20\2\0"+
+    "\4\41\2\0\1\41\1\0\3\41\5\0\1\20\2\0"+
+    "\4\41\2\0\1\54\1\0\1\41\2\47\1\0\2\47"+
+    "\1\0\15\47\1\50\1\41\1\0\1\15\1\0\2\15"+
+    "\1\17\2\0\1\51\1\41\1\52\1\50\1\53\1\0"+
+    "\1\52\1\0\1\50\1\51\1\41\1\0\1\15\1\0"+
+    "\2\15\1\17\2\0\1\51\2\41\1\51\2\0\1\41"+
+    "\1\0\1\51\2\41\5\0\1\20\2\0\2\41\1\52"+
+    "\1\41\1\53\1\0\1\52\1\0\3\41\10\0\2\41"+
+    "\1\52\1\41\1\53\1\0\1\52\1\0\1\41\1\40"+
+    "\1\41\5\0\1\20\2\0\3\41\1\40\2\0\1\41"+
+    "\1\0\1\40";
+
+  private static int [] zzUnpacktrans() {
+    int [] result = new int[665];
+    int offset = 0;
+    offset = zzUnpacktrans(ZZ_TRANS_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpacktrans(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      value--;
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /* error codes */
+  private static final int ZZ_UNKNOWN_ERROR = 0;
+  private static final int ZZ_NO_MATCH = 1;
+  private static final int ZZ_PUSHBACK_2BIG = 2;
+
+  /* error messages for the codes above */
+  private static final String[] ZZ_ERROR_MSG = {
+    "Unknown internal scanner error",
+    "Error: could not match input",
+    "Error: pushback value was too large"
+  };
+
+  /**
+   * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}
+   */
+  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+  private static final String ZZ_ATTRIBUTE_PACKED_0 =
+    "\4\0\3\1\1\11\16\1\3\11\1\1\1\0\2\1"+
+    "\1\0\1\1\4\0\6\1\3\0";
+
+  private static int [] zzUnpackAttribute() {
+    int [] result = new int[44];
+    int offset = 0;
+    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /** the input device */
+  private java.io.Reader zzReader;
+
+  /** the current state of the DFA */
+  private int zzState;
+
+  /** the current lexical state */
+  private int zzLexicalState = YYINITIAL;
+
+  /** this buffer contains the current text to be matched and is
+      the source of the yytext() string */
+  private CharSequence zzBuffer = "";
+
+  /** the textposition at the last accepting state */
+  private int zzMarkedPos;
+
+  /** the current text position in the buffer */
+  private int zzCurrentPos;
+
+  /** startRead marks the beginning of the yytext() string in the buffer */
+  private int zzStartRead;
+
+  /** endRead marks the last character in the buffer, that has been read
+      from input */
+  private int zzEndRead;
+
+  /** zzAtEOF == true <=> the scanner is at the EOF */
+  private boolean zzAtEOF;
+
+  /** Number of newlines encountered up to the start of the matched text. */
+  @SuppressWarnings("unused")
+  private int yyline;
+
+  /** Number of characters from the last newline up to the start of the matched text. */
+  @SuppressWarnings("unused")
+  protected int yycolumn;
+
+  /** Number of characters up to the start of the matched text. */
+  @SuppressWarnings("unused")
+  private long yychar;
+
+  /** Whether the scanner is currently at the beginning of a line. */
+  @SuppressWarnings("unused")
+  private boolean zzAtBOL = true;
+
+  /** Whether the user-EOF-code has already been executed. */
+  private boolean zzEOFDone;
+
+
+  /**
+   * Creates a new scanner
+   *
+   * @param   in  the java.io.Reader to read input from.
+   */
+  IJPerfLexer(java.io.Reader in) {
+    this.zzReader = in;
+  }
+
+
+  /** Returns the maximum size of the scanner buffer, which limits the size of tokens. */
+  private int zzMaxBufferLen() {
+    return Integer.MAX_VALUE;
+  }
+
+  /**  Whether the scanner buffer can grow to accommodate a larger token. */
+  private boolean zzCanGrow() {
+    return true;
+  }
+
+  /**
+   * Translates raw input code points to DFA table row
+   */
+  private static int zzCMap(int input) {
+    int offset = input & 255;
+    return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];
+  }
+
+  public final int getTokenStart() {
+    return zzStartRead;
+  }
+
+  public final int getTokenEnd() {
+    return getTokenStart() + yylength();
+  }
+
+  public void reset(CharSequence buffer, int start, int end, int initialState) {
+    zzBuffer = buffer;
+    zzCurrentPos = zzMarkedPos = zzStartRead = start;
+    zzAtEOF  = false;
+    zzAtBOL = true;
+    zzEndRead = end;
+    yybegin(initialState);
+  }
+
+  /**
+   * Refills the input buffer.
+   *
+   * @return      {@code false}, iff there was new input.
+   *
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  private boolean zzRefill() throws java.io.IOException {
+    return true;
+  }
+
+
+  /**
+   * Returns the current lexical state.
+   */
+  public final int yystate() {
+    return zzLexicalState;
+  }
+
+
+  /**
+   * Enters a new lexical state
+   *
+   * @param newState the new lexical state
+   */
+  public final void yybegin(int newState) {
+    zzLexicalState = newState;
+  }
+
+
+  /**
+   * Returns the text matched by the current regular expression.
+   */
+  public final CharSequence yytext() {
+    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+  }
+
+
+  /**
+   * Returns the character at position {@code pos} from the
+   * matched text.
+   *
+   * It is equivalent to yytext().charAt(pos), but faster
+   *
+   * @param pos the position of the character to fetch.
+   *            A value from 0 to yylength()-1.
+   *
+   * @return the character at position pos
+   */
+  public final char yycharat(int pos) {
+    return zzBuffer.charAt(zzStartRead+pos);
+  }
+
+
+  /**
+   * Returns the length of the matched text region.
+   */
+  public final int yylength() {
+    return zzMarkedPos-zzStartRead;
+  }
+
+
+  /**
+   * Reports an error that occurred while scanning.
+   *
+   * In a wellformed scanner (no or only correct usage of
+   * yypushback(int) and a match-all fallback rule) this method
+   * will only be called with things that "Can't Possibly Happen".
+   * If this method is called, something is seriously wrong
+   * (e.g. a JFlex bug producing a faulty scanner etc.).
+   *
+   * Usual syntax/scanner level error handling should be done
+   * in error fallback rules.
+   *
+   * @param   errorCode  the code of the errormessage to display
+   */
+  private void zzScanError(int errorCode) {
+    String message;
+    try {
+      message = ZZ_ERROR_MSG[errorCode];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+    }
+
+    throw new Error(message);
+  }
+
+
+  /**
+   * Pushes the specified amount of characters back into the input stream.
+   *
+   * They will be read again by then next call of the scanning method
+   *
+   * @param number  the number of characters to be read again.
+   *                This number must not be greater than yylength()!
+   */
+  public void yypushback(int number)  {
+    if ( number > yylength() )
+      zzScanError(ZZ_PUSHBACK_2BIG);
+
+    zzMarkedPos -= number;
+  }
+
+
+  /**
+   * Contains user EOF-code, which will be executed exactly once,
+   * when the end of file is reached
+   */
+  private void zzDoEOF() {
+    if (!zzEOFDone) {
+      zzEOFDone = true;
+    
+    }
+  }
+
+
+  /**
+   * Resumes scanning until the next regular expression is matched,
+   * the end of input is encountered or an I/O-Error occurs.
+   *
+   * @return      the next token
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  public IElementType advance() throws java.io.IOException
+  {
+    int zzInput;
+    int zzAction;
+
+    // cached fields:
+    int zzCurrentPosL;
+    int zzMarkedPosL;
+    int zzEndReadL = zzEndRead;
+    CharSequence zzBufferL = zzBuffer;
+
+    int [] zzTransL = ZZ_TRANS;
+    int [] zzRowMapL = ZZ_ROWMAP;
+    int [] zzAttrL = ZZ_ATTRIBUTE;
+
+    while (true) {
+      zzMarkedPosL = zzMarkedPos;
+
+      zzAction = -1;
+
+      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+      zzState = ZZ_LEXSTATE[zzLexicalState];
+
+      // set up zzAction for empty match case:
+      int zzAttributes = zzAttrL[zzState];
+      if ( (zzAttributes & 1) == 1 ) {
+        zzAction = zzState;
+      }
+
+
+      zzForAction: {
+        while (true) {
+
+          if (zzCurrentPosL < zzEndReadL) {
+            zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL);
+            zzCurrentPosL += Character.charCount(zzInput);
+          }
+          else if (zzAtEOF) {
+            zzInput = YYEOF;
+            break zzForAction;
+          }
+          else {
+            // store back cached positions
+            zzCurrentPos  = zzCurrentPosL;
+            zzMarkedPos   = zzMarkedPosL;
+            boolean eof = zzRefill();
+            // get translated positions and possibly new buffer
+            zzCurrentPosL  = zzCurrentPos;
+            zzMarkedPosL   = zzMarkedPos;
+            zzBufferL      = zzBuffer;
+            zzEndReadL     = zzEndRead;
+            if (eof) {
+              zzInput = YYEOF;
+              break zzForAction;
+            }
+            else {
+              zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL);
+              zzCurrentPosL += Character.charCount(zzInput);
+            }
+          }
+          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMap(zzInput) ];
+          if (zzNext == -1) break zzForAction;
+          zzState = zzNext;
+
+          zzAttributes = zzAttrL[zzState];
+          if ( (zzAttributes & 1) == 1 ) {
+            zzAction = zzState;
+            zzMarkedPosL = zzCurrentPosL;
+            if ( (zzAttributes & 8) == 8 ) break zzForAction;
+          }
+
+        }
+      }
+
+      // store back cached position
+      zzMarkedPos = zzMarkedPosL;
+
+      if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+        zzAtEOF = true;
+            zzDoEOF();
+        return null;
+      }
+      else {
+        switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+          case 1:
+            { yybegin(WAITING_INPUT); return IJPerfElementTypes.COMMAND;
+            }
+          // fall through
+          case 13: break;
+          case 2:
+            { yybegin(YYINITIAL); return TokenType.WHITE_SPACE;
+            }
+          // fall through
+          case 14: break;
+          case 3:
+            { return TokenType.BAD_CHARACTER;
+            }
+          // fall through
+          case 15: break;
+          case 4:
+            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.IDENTIFIER;
+            }
+          // fall through
+          case 16: break;
+          case 5:
+            { yybegin(WAITING_LAST_OPTION); return TokenType.WHITE_SPACE;
+            }
+          // fall through
+          case 17: break;
+          case 6:
+            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.FILE_PATH;
+            }
+          // fall through
+          case 18: break;
+          case 7:
+            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.NUMBER;
+            }
+          // fall through
+          case 19: break;
+          case 8:
+            { yybegin(YYINITIAL); return IJPerfElementTypes.TEXT;
+            }
+          // fall through
+          case 20: break;
+          case 9:
+            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.OPTIONS_SEPARATOR;
+            }
+          // fall through
+          case 21: break;
+          case 10:
+            { yybegin(WAITING_LAST_OPTION); return IJPerfElementTypes.ASSIGNMENT_OPERATOR;
+            }
+          // fall through
+          case 22: break;
+          case 11:
+            { yybegin(WAITING_TEXT); return IJPerfElementTypes.PIPE;
+            }
+          // fall through
+          case 23: break;
+          case 12:
+            { yybegin(YYINITIAL); return IJPerfElementTypes.COMMENT;
+            }
+          // fall through
+          case 24: break;
+          default:
+            zzScanError(ZZ_NO_MATCH);
+          }
+      }
+    }
+  }
+
+
+}
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/parser/IJPerfParser.java
similarity index 98%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/parser/IJPerfParser.java
index 9d9625f51a78..f250a7378fd9 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/parser/IJPerfParser.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/parser/IJPerfParser.java
@@ -1,9 +1,9 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.parser;
+package com.jetbrains.performanceScripts.lang.parser;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiBuilder.Marker;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import static com.intellij.lang.parser.GeneratedParserUtilBase.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.ASTNode;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfCommandLine.java
similarity index 86%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfCommandLine.java
index ece47ce91ad1..23526cf23c1a 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandLine.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfCommandLine.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfCommandName.java
similarity index 88%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfCommandName.java
index 8f34123f21a9..ceb18a9ced18 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfCommandName.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfCommandName.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfDelayTypingOption.java
similarity index 81%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfDelayTypingOption.java
index 8b46bf9fd931..d9ac5551ab61 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfDelayTypingOption.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfDelayTypingOption.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfElementTypes.java
similarity index 95%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfElementTypes.java
index d4398713fe58..a00f09fe5238 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfElementTypes.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfElementTypes.java
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.PsiElement;
 import com.intellij.lang.ASTNode;
-import com.jetbrains.performancePlugin.lang.psi.impl.*;
+import com.jetbrains.performanceScripts.lang.psi.impl.*;
 
 public interface IJPerfElementTypes {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfGotoOption.java
similarity index 80%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfGotoOption.java
index bb150f7bf2f7..cd6c5b6ca10a 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfGotoOption.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfGotoOption.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfOption.java
similarity index 88%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfOption.java
index fc4733b9d220..2a429562bd9e 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOption.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfOption.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfOptionList.java
similarity index 83%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfOptionList.java
index c725b0261edc..86255d8dcde8 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfOptionList.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfOptionList.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfSimpleOption.java
similarity index 81%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfSimpleOption.java
index e6737a4c24f4..82a22df529ac 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfSimpleOption.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfSimpleOption.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfStatement.java
similarity index 83%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfStatement.java
index 161a32fcd956..472c75bed96c 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfStatement.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfVisitor.java
similarity index 95%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfVisitor.java
index 71eab5312f5e..9474db6236e2 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/IJPerfVisitor.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/IJPerfVisitor.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElementVisitor;
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfCommandLineImpl.java
similarity index 84%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfCommandLineImpl.java
index 22b78488982e..ad6e1f85b3b4 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandLineImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfCommandLineImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfCommandLineImpl extends ASTWrapperPsiElement implements IJPerfCommandLine {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfCommandNameImpl.java
similarity index 85%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfCommandNameImpl.java
index 3ab329f32b77..d56997051bff 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfCommandNameImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfCommandNameImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfCommandNameImpl extends ASTWrapperPsiElement implements IJPerfCommandName {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
similarity index 81%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
index 8a118d4e458c..f15c1db42155 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfDelayTypingOptionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfDelayTypingOptionImpl extends ASTWrapperPsiElement implements IJPerfDelayTypingOption {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfGotoOptionImpl.java
similarity index 80%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfGotoOptionImpl.java
index d6fd5e7cc978..c70eb4f0f7f2 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfGotoOptionImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfGotoOptionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfGotoOptionImpl extends ASTWrapperPsiElement implements IJPerfGotoOption {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfOptionImpl.java
similarity index 86%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfOptionImpl.java
index eef2bcbb3abe..b74a261b6122 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfOptionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfOptionImpl extends ASTWrapperPsiElement implements IJPerfOption {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfOptionListImpl.java
similarity index 83%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfOptionListImpl.java
index 274793abfd63..e691780dc37a 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfOptionListImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfOptionListImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfOptionListImpl extends ASTWrapperPsiElement implements IJPerfOptionList {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfSimpleOptionImpl.java
similarity index 80%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfSimpleOptionImpl.java
index 0991e188b9f6..bf9a63078024 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfSimpleOptionImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfSimpleOptionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfSimpleOptionImpl extends ASTWrapperPsiElement implements IJPerfSimpleOption {
 
diff --git a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfStatementImpl.java
similarity index 82%
rename from plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java
rename to plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfStatementImpl.java
index a2de16678850..9212ae7885b8 100644
--- a/plugins/performanceTesting/core/gen/com/jetbrains/performancePlugin/lang/psi/impl/IJPerfStatementImpl.java
+++ b/plugins/performanceTesting/scripts-ui/gen/com/jetbrains/performanceScripts/lang/psi/impl/IJPerfStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.performancePlugin.lang.psi.impl;
+package com.jetbrains.performanceScripts.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes.*;
+import static com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
-import com.jetbrains.performancePlugin.lang.psi.*;
+import com.jetbrains.performanceScripts.lang.psi.*;
 
 public class IJPerfStatementImpl extends ASTWrapperPsiElement implements IJPerfStatement {
 
diff --git a/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml
index 54b8c267c1c9..d6e5c6128530 100644
--- a/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml
+++ b/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml
@@ -5,8 +5,20 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.performanceTesting" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/performanceTesting/scripts-ui/resources/.gitkeep b/plugins/performanceTesting/scripts-ui/resources/.gitkeep
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/plugins/performanceTesting/scripts-ui/resources/META-INF/plugin.xml b/plugins/performanceTesting/scripts-ui/resources/META-INF/plugin.xml
new file mode 100644
index 000000000000..4e68634ced06
--- /dev/null
+++ b/plugins/performanceTesting/scripts-ui/resources/META-INF/plugin.xml
@@ -0,0 +1,41 @@
+<idea-plugin package="com.jetbrains.performanceScripts">
+  <id>com.jetbrains.performanceScripts</id>
+  <name>Performance Scripts UI</name>
+  <vendor>JetBrains</vendor>
+
+  <description>
+    Provides UI to execute performance scripts written in IJPerf language.
+    Run scripts from Help | Diagnostic Tools | Execute Performance Script…
+  </description>
+
+  <resource-bundle>messages.PerformanceScriptsBundle</resource-bundle>
+
+  <dependencies>
+    <plugin id="com.intellij.modules.lang"/>
+    <plugin id="com.jetbrains.performancePlugin"/>
+  </dependencies>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <fileType name="IntegrationPerformanceTest"
+              implementationClass="com.jetbrains.performanceScripts.lang.IJPerfFileType"
+              fieldName="INSTANCE" language="IntegrationPerformanceTest" extensions="ijperf"/>
+
+    <lang.parserDefinition language="IntegrationPerformanceTest"
+                           implementationClass="com.jetbrains.performanceScripts.lang.IJPerfParserDefinition"/>
+
+    <lang.syntaxHighlighterFactory language="IntegrationPerformanceTest"
+                                   implementationClass="com.jetbrains.performanceScripts.lang.IJPerfSyntaxHighlighterFactory"/>
+
+    <completion.contributor language="IntegrationPerformanceTest"
+                            implementationClass="com.jetbrains.performanceScripts.lang.completion.IJPerfCompletionContributor"/>
+
+    <annotator language="IntegrationPerformanceTest"
+               implementationClass="com.jetbrains.performanceScripts.lang.inspections.IJPerfStartStopProfileInspection"/>
+  </extensions>
+
+  <actions>
+    <action id="performancePlugin.ExecuteScriptAction" class="com.jetbrains.performanceScripts.ui.ExecuteScriptAction">
+      <add-to-group group-id="DiagnosticGroup" anchor="after" relative-to-action="CaptureMemorySnapShot"/>
+    </action>
+  </actions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/performanceTesting/scripts-ui/resources/messages/PerformanceScriptsBundle.properties b/plugins/performanceTesting/scripts-ui/resources/messages/PerformanceScriptsBundle.properties
new file mode 100644
index 000000000000..53ee780690e0
--- /dev/null
+++ b/plugins/performanceTesting/scripts-ui/resources/messages/PerformanceScriptsBundle.properties
@@ -0,0 +1,18 @@
+select.scenario=Please select &scenario:
+executor.title=Performance Issue Reporter
+execute.script.button=&Execute
+typing.scenario=Typing
+formatting.scenario=Formatting
+local.inspection.scenario=Local Inspection
+
+action.performancePlugin.ExecuteScriptAction.text=Execute Performance Script\u2026
+action.performancePlugin.ExecuteScriptAction.description=Execute performance test script
+
+filetype.ijperformance.test.description=Script of integration performance test
+filetype.ijperformance.test.display.name=ijperf script
+
+task.title.executing.performance.script=Executing performance script
+
+intention.add.stopcommand=Add `%stopProfile` command
+inspection.message.activity.started.but.never.closed.with.stopprofile=`{0}` activity started, but never closed with `%stopProfile`
+inspection.message.two.startprofile.commands.cant.follow.each.other=`%startProfile` commands can''t follow each other. Add `%stopProfile` before `{0}`
diff --git a/plugins/performanceTesting/scripts-ui/src/.gitkeep b/plugins/performanceTesting/scripts-ui/src/.gitkeep
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/PerformanceScriptsBundle.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/PerformanceScriptsBundle.java
new file mode 100644
index 000000000000..d32ab5e88a80
--- /dev/null
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/PerformanceScriptsBundle.java
@@ -0,0 +1,33 @@
+package com.jetbrains.performanceScripts;
+
+import com.intellij.DynamicBundle;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.PropertyKey;
+
+import java.util.function.Supplier;
+
+public final class PerformanceScriptsBundle {
+
+  private static final @NonNls String BUNDLE_FQN = "messages.PerformanceScriptsBundle";
+  private static final DynamicBundle BUNDLE = new DynamicBundle(PerformanceScriptsBundle.class, BUNDLE_FQN);
+
+  private PerformanceScriptsBundle() {
+  }
+
+  public static @Nls @NotNull String message(
+    @PropertyKey(resourceBundle = BUNDLE_FQN) @NotNull String key,
+    @Nullable Object @NotNull ... params
+  ) {
+    return BUNDLE.getMessage(key, params);
+  }
+
+  public static @NotNull Supplier<@Nls @NotNull String> messagePointer(
+    @PropertyKey(resourceBundle = BUNDLE_FQN) @NotNull String key,
+    @Nullable Object @NotNull ... params
+  ) {
+    return BUNDLE.getLazyMessage(key, params);
+  }
+}
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfFileType.java
similarity index 78%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfFileType.java
index eabd587eeb96..cc62343abce5 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfFileType.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfFileType.java
@@ -1,8 +1,8 @@
-package com.jetbrains.performancePlugin.lang;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.jetbrains.performancePlugin.PerformanceTestingBundle;
+import com.jetbrains.performanceScripts.PerformanceScriptsBundle;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -23,13 +23,13 @@ public final class IJPerfFileType extends LanguageFileType {
   @NotNull
   @Override
   public String getDisplayName() {
-    return PerformanceTestingBundle.message("filetype.ijperformance.test.display.name");
+    return PerformanceScriptsBundle.message("filetype.ijperformance.test.display.name");
   }
 
   @NotNull
   @Override
   public String getDescription() {
-    return PerformanceTestingBundle.message("filetype.ijperformance.test.description");
+    return PerformanceScriptsBundle.message("filetype.ijperformance.test.description");
   }
 
   @NotNull
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfLanguage.java
similarity index 83%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfLanguage.java
index 68345d34737a..12a53f6fdd39 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfLanguage.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfLanguage.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.lang.Language;
 
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfParserDefinition.java
similarity index 82%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfParserDefinition.java
index 1477cbb24244..35cc0a974a7b 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfParserDefinition.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfParserDefinition.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.ParserDefinition;
@@ -10,10 +10,10 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
-import com.jetbrains.performancePlugin.lang.lexer.IJPerfLexerAdapter;
-import com.jetbrains.performancePlugin.lang.parser.IJPerfParser;
-import com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes;
-import com.jetbrains.performancePlugin.lang.psi.IJPerfFile;
+import com.jetbrains.performanceScripts.lang.lexer.IJPerfLexerAdapter;
+import com.jetbrains.performanceScripts.lang.parser.IJPerfParser;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfFile;
 import org.jetbrains.annotations.NotNull;
 
 public class IJPerfParserDefinition implements ParserDefinition {
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfSyntaxHighlighter.java
similarity index 93%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfSyntaxHighlighter.java
index 339c407c9f7d..a568bc817380 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighter.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfSyntaxHighlighter.java
@@ -1,12 +1,12 @@
-package com.jetbrains.performancePlugin.lang;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.tree.IElementType;
-import com.jetbrains.performancePlugin.lang.lexer.IJPerfLexerAdapter;
-import com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes;
+import com.jetbrains.performanceScripts.lang.lexer.IJPerfLexerAdapter;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes;
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.openapi.editor.colors.TextAttributesKey.EMPTY_ARRAY;
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfSyntaxHighlighterFactory.java
similarity index 92%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfSyntaxHighlighterFactory.java
index d3436c583cae..f39ed57cf56e 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfSyntaxHighlighterFactory.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfSyntaxHighlighterFactory.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfTokenSets.java
similarity index 63%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfTokenSets.java
index 0e018768d585..2e27ac2fcfcb 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/IJPerfTokenSets.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/IJPerfTokenSets.java
@@ -1,7 +1,7 @@
-package com.jetbrains.performancePlugin.lang;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.psi.tree.TokenSet;
-import com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes;
 
 public final class IJPerfTokenSets {
   private IJPerfTokenSets() {
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/completion/IJPerfCompletionContributor.java
similarity index 88%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/completion/IJPerfCompletionContributor.java
index a1b2adabca18..6def52ed2dfd 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionContributor.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/completion/IJPerfCompletionContributor.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang.completion;
+package com.jetbrains.performanceScripts.lang.completion;
 
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElement;
@@ -9,12 +9,12 @@ import com.intellij.patterns.StandardPatterns;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.performancePlugin.CommandProvider;
-import com.jetbrains.performancePlugin.lang.psi.IJPerfCommandName;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfCommandName;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-public class IJPerfCompletionContributor extends CompletionContributor implements DumbAware {
+class IJPerfCompletionContributor extends CompletionContributor implements DumbAware {
 
   public IJPerfCompletionContributor() {
     extend(CompletionType.BASIC, PlatformPatterns.psiElement().withParent(PlatformPatterns.psiElement(IJPerfCommandName.class)),
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/inspections/IJPerfStartStopProfileInspection.java
similarity index 86%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/inspections/IJPerfStartStopProfileInspection.java
index 73391dfb32fd..2ff2d40eccf2 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/inspections/IJPerfStartStopProfileInspection.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/inspections/IJPerfStartStopProfileInspection.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang.inspections;
+package com.jetbrains.performanceScripts.lang.inspections;
 
 import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
 import com.intellij.lang.annotation.AnnotationHolder;
@@ -10,14 +10,14 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.util.IncorrectOperationException;
-import com.jetbrains.performancePlugin.PerformanceTestingBundle;
 import com.jetbrains.performancePlugin.commands.StartProfileCommand;
 import com.jetbrains.performancePlugin.commands.StopProfileCommand;
-import com.jetbrains.performancePlugin.lang.IJPerfLanguage;
-import com.jetbrains.performancePlugin.lang.psi.IJPerfFile;
+import com.jetbrains.performanceScripts.PerformanceScriptsBundle;
+import com.jetbrains.performanceScripts.lang.IJPerfLanguage;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfFile;
 import org.jetbrains.annotations.NotNull;
 
-public class IJPerfStartStopProfileInspection implements Annotator {
+class IJPerfStartStopProfileInspection implements Annotator {
 
   @Override
   public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
@@ -51,7 +51,7 @@ public class IJPerfStartStopProfileInspection implements Annotator {
     if (startCommand != null) {
       holder
         .newAnnotation(HighlightSeverity.WARNING,
-                       PerformanceTestingBundle.message("inspection.message.activity.started.but.never.closed.with.stopprofile",
+                       PerformanceScriptsBundle.message("inspection.message.activity.started.but.never.closed.with.stopprofile",
                                                         startCommand.getText()))
         .range(startCommand)
         .withFix(new AddStopCommandFix())
@@ -63,7 +63,7 @@ public class IJPerfStartStopProfileInspection implements Annotator {
     if (prevStartCommand != null && curStartCommand != null) {
       holder
         .newAnnotation(HighlightSeverity.ERROR,
-                       PerformanceTestingBundle.message("inspection.message.two.startprofile.commands.cant.follow.each.other",
+                       PerformanceScriptsBundle.message("inspection.message.two.startprofile.commands.cant.follow.each.other",
                                                         curStartCommand.getText()))
         .range(curStartCommand)
         .withFix(new AddStopCommandFix())
@@ -75,12 +75,12 @@ public class IJPerfStartStopProfileInspection implements Annotator {
 
     @Override
     public @NotNull String getFamilyName() {
-      return PerformanceTestingBundle.message("intention.add.stopcommand");
+      return PerformanceScriptsBundle.message("intention.add.stopcommand");
     }
 
     @Override
     public @NotNull String getText() {
-      return PerformanceTestingBundle.message("intention.add.stopcommand");
+      return PerformanceScriptsBundle.message("intention.add.stopcommand");
     }
 
     @Override
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/lexer/IJPerf.flex
similarity index 96%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/lexer/IJPerf.flex
index 601c29423910..310c1213eb87 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerf.flex
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/lexer/IJPerf.flex
@@ -1,6 +1,6 @@
-package com.jetbrains.performancePlugin.lang.lexer;
+package com.jetbrains.performanceScripts.lang.lexer;
 
-import com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes;
+import com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.TokenType;
 import com.intellij.lexer.FlexLexer;
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/lexer/IJPerfLexerAdapter.java
similarity index 76%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/lexer/IJPerfLexerAdapter.java
index ad36c74ba285..9929e7b4332e 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerAdapter.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/lexer/IJPerfLexerAdapter.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang.lexer;
+package com.jetbrains.performanceScripts.lang.lexer;
 
 import com.intellij.lexer.FlexAdapter;
 
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerf.bnf
similarity index 55%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerf.bnf
index 728d7fc6af31..f2156d2b0b0a 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerf.bnf
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerf.bnf
@@ -1,14 +1,14 @@
 {
-  parserClass="com.jetbrains.performancePlugin.lang.parser.IJPerfParser"
+  parserClass="com.jetbrains.performanceScripts.lang.parser.IJPerfParser"
   extends="com.intellij.extapi.psi.ASTWrapperPsiElement"
   psiClassPrefix="IJPerf"
   psiImplClassSuffix="Impl"
-  psiPackage="com.jetbrains.performancePlugin.lang.psi"
-  psiImplPackage="com.jetbrains.performancePlugin.lang.psi.impl"
-  elementTypeHolderClass="com.jetbrains.performancePlugin.lang.psi.IJPerfElementTypes"
-  elementTypeClass="com.jetbrains.performancePlugin.lang.psi.IJPerfElementType"
-  tokenTypeClass="com.jetbrains.performancePlugin.lang.psi.IJPerfTokenType"
-  psiImplUtilClass="com.jetbrains.performancePlugin.lang.psi.IJPerfPsiImplUtil"
+  psiPackage="com.jetbrains.performanceScripts.lang.psi"
+  psiImplPackage="com.jetbrains.performanceScripts.lang.psi.impl"
+  elementTypeHolderClass="com.jetbrains.performanceScripts.lang.psi.IJPerfElementTypes"
+  elementTypeClass="com.jetbrains.performanceScripts.lang.psi.IJPerfElementType"
+  tokenTypeClass="com.jetbrains.performanceScripts.lang.psi.IJPerfTokenType"
+  psiImplUtilClass="com.jetbrains.performanceScripts.lang.psi.IJPerfPsiImplUtil"
 }
 
 scriptFile ::= statement*
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfElementFactory.java
similarity index 83%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfElementFactory.java
index 0e9c92ace756..11b3c75b9c0b 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementFactory.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfElementFactory.java
@@ -1,8 +1,8 @@
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFileFactory;
-import com.jetbrains.performancePlugin.lang.IJPerfFileType;
+import com.jetbrains.performanceScripts.lang.IJPerfFileType;
 
 public final class IJPerfElementFactory {
   public static IJPerfCommandName createCommandName(Project project, String name) {
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfElementType.java
similarity index 72%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfElementType.java
index e114e9866901..a70f8080c0e2 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfElementType.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfElementType.java
@@ -1,7 +1,7 @@
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import com.intellij.psi.tree.IElementType;
-import com.jetbrains.performancePlugin.lang.IJPerfLanguage;
+import com.jetbrains.performanceScripts.lang.IJPerfLanguage;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfFile.java
similarity index 75%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfFile.java
index 14ab02049925..ddfa9045054c 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfFile.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfFile.java
@@ -1,10 +1,10 @@
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
-import com.jetbrains.performancePlugin.lang.IJPerfFileType;
-import com.jetbrains.performancePlugin.lang.IJPerfLanguage;
+import com.jetbrains.performanceScripts.lang.IJPerfFileType;
+import com.jetbrains.performanceScripts.lang.IJPerfLanguage;
 import org.jetbrains.annotations.NotNull;
 
 public class IJPerfFile extends PsiFileBase {
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfPsiImplUtil.java
similarity index 93%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfPsiImplUtil.java
index bf0ec0096412..7c0229ec63ec 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfPsiImplUtil.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfPsiImplUtil.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfTokenType.java
similarity index 78%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfTokenType.java
index 0cced2011779..32dfe0e3741e 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/lang/psi/IJPerfTokenType.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/lang/psi/IJPerfTokenType.java
@@ -1,7 +1,7 @@
-package com.jetbrains.performancePlugin.lang.psi;
+package com.jetbrains.performanceScripts.lang.psi;
 
 import com.intellij.psi.tree.IElementType;
-import com.jetbrains.performancePlugin.lang.IJPerfLanguage;
+import com.jetbrains.performanceScripts.lang.IJPerfLanguage;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptAction.java
similarity index 81%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptAction.java
index 6c2c46ac859a..2a46c6b98348 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/actions/ExecuteScriptAction.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptAction.java
@@ -1,15 +1,13 @@
-package com.jetbrains.performancePlugin.actions;
+package com.jetbrains.performanceScripts.ui;
 
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.performancePlugin.ui.ExecuteScriptDialog;
 import org.jetbrains.annotations.NotNull;
 
-
-public class ExecuteScriptAction extends AnAction implements DumbAware {
+class ExecuteScriptAction extends AnAction implements DumbAware {
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
     Project project = e.getProject();
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptDialog.form
similarity index 93%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptDialog.form
index 765cd3898c53..79926d483ab4 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.form
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.performancePlugin.ui.ExecuteScriptDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.performanceScripts.ui.ExecuteScriptDialog">
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
@@ -20,7 +20,7 @@
         </constraints>
         <properties>
           <labelFor value="b3a75"/>
-          <text resource-bundle="messages/PerformanceTestingBundle" key="select.scenario"/>
+          <text resource-bundle="messages/PerformanceScriptsBundle" key="select.scenario"/>
         </properties>
       </component>
       <scrollpane id="34ef6" class="com.intellij.ui.components.JBScrollPane">
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptDialog.java
similarity index 89%
rename from plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java
rename to plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptDialog.java
index 22707e09fffc..3af7d11f02cf 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/ui/ExecuteScriptDialog.java
+++ b/plugins/performanceTesting/scripts-ui/src/com/jetbrains/performanceScripts/ui/ExecuteScriptDialog.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.ui;
+package com.jetbrains.performanceScripts.ui;
 
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
@@ -6,9 +6,9 @@ import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.EditorTextField;
-import com.jetbrains.performancePlugin.PerformanceTestingBundle;
-import com.jetbrains.performancePlugin.lang.IJPerfFileType;
 import com.jetbrains.performancePlugin.utils.ScriptRunner;
+import com.jetbrains.performanceScripts.PerformanceScriptsBundle;
+import com.jetbrains.performanceScripts.lang.IJPerfFileType;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -32,10 +32,10 @@ public final class ExecuteScriptDialog extends DialogWrapper {
     this.project = project;
     myScriptRunner = new ScriptRunner();
     execute = createExecuteAction();
-    setTitle(PerformanceTestingBundle.message("executor.title"));
-    scenarioComboBox.addItem(new Scenario(PerformanceTestingBundle.message("typing.scenario"), generateTestScript(PerformanceScriptType.TYPING)));
-    scenarioComboBox.addItem(new Scenario(PerformanceTestingBundle.message("formatting.scenario"), generateTestScript(PerformanceScriptType.FORMATTING)));
-    scenarioComboBox.addItem(new Scenario(PerformanceTestingBundle.message("local.inspection.scenario"), generateTestScript(PerformanceScriptType.INSPECTION)));
+    setTitle(PerformanceScriptsBundle.message("executor.title"));
+    scenarioComboBox.addItem(new Scenario(PerformanceScriptsBundle.message("typing.scenario"), generateTestScript(PerformanceScriptType.TYPING)));
+    scenarioComboBox.addItem(new Scenario(PerformanceScriptsBundle.message("formatting.scenario"), generateTestScript(PerformanceScriptType.FORMATTING)));
+    scenarioComboBox.addItem(new Scenario(PerformanceScriptsBundle.message("local.inspection.scenario"), generateTestScript(PerformanceScriptType.INSPECTION)));
     scenarioComboBox.setEditable(false);
     scenarioComboBox.setSelectedIndex(0);
     scenarioComboBox.addItemListener(new ItemListener() {
@@ -98,7 +98,7 @@ public final class ExecuteScriptDialog extends DialogWrapper {
   }
 
   private Action createExecuteAction() {
-    return new DialogWrapperAction(PerformanceTestingBundle.message("execute.script.button")) {
+    return new DialogWrapperAction(PerformanceScriptsBundle.message("execute.script.button")) {
       @Override
       protected void doAction(ActionEvent e) {
         //noinspection AssignmentToStaticFieldFromInstanceMethod
diff --git a/plugins/performanceTesting/core/testData/completion/afterCommand.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/afterCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/afterCommand.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/afterCommand.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/betweenStatements.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/betweenStatements.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/betweenStatements.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/betweenStatements.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/doublePrefix.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/doublePrefix.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/doublePrefix.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/doublePrefix.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/emptyFile.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/emptyFile.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/emptyFile.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/emptyFile.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/endOfStatement.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/endOfStatement.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/endOfStatement.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/endOfStatement.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/inOptionList.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/inOptionList.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/inOptionList.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/inOptionList.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/onCommand.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/onCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/onCommand.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/onCommand.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/singlePrefix.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/singlePrefix.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/singlePrefix.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/singlePrefix.ijperf
diff --git a/plugins/performanceTesting/core/testData/completion/withoutPrefix.ijperf b/plugins/performanceTesting/scripts-ui/testData/completion/withoutPrefix.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/completion/withoutPrefix.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/completion/withoutPrefix.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/commandWithoutParams.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/commandWithoutParams.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/commandWithoutParams.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/commandWithoutParams.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/commandWithoutParams.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/commandWithoutParams.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/commandWithoutParams.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/commandWithoutParams.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/comment.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/comment.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/comment.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/comment.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/comment.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/comment.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/comment.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/comment.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/doublePrefixCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/doublePrefixCommand.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/doublePrefixCommand.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/doublePrefixCommand.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/doublePrefixCommand.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/filePathInParameters.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/filePathInParameters.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/filePathInParameters.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/filePathInParameters.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/filePathInParameters.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/filePathInParameters.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/filePathInParameters.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/filePathInParameters.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/numberOptions.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/numberOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/numberOptions.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/numberOptions.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/numberOptions.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/numberOptions.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/numberOptions.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/numberOptions.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/optionWithValue.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/optionWithValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/optionWithValue.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/optionWithValue.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/optionWithValue.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/optionWithValue.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/optionWithValue.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/optionWithValue.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/pipeSeparatedOption.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/pipeSeparatedOption.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/pipeSeparatedOption.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/pipeSeparatedOption.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/pipeSeparatedOption.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/scriptWithEmptyLines.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/scriptWithEmptyLines.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/scriptWithEmptyLines.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/scriptWithEmptyLines.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/scriptWithEmptyLines.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/singlePrefixCommand.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/singlePrefixCommand.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/singlePrefixCommand.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/singlePrefixCommand.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/singlePrefixCommand.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParameters.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParameters.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParameters.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/spaceSeparatedParameters.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParameters.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParametersValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParametersValue.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParametersValue.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/spaceSeparatedParametersValue.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/spaceSeparatedParametersValue.txt
diff --git a/plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.ijperf b/plugins/performanceTesting/scripts-ui/testData/lexer/textOptionWithSymbols.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/lexer/textOptionWithSymbols.ijperf
diff --git a/plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.txt b/plugins/performanceTesting/scripts-ui/testData/lexer/textOptionWithSymbols.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/lexer/textOptionWithSymbols.txt
rename to plugins/performanceTesting/scripts-ui/testData/lexer/textOptionWithSymbols.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithFilePathInParameters.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithFilePathInParameters.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithFilePathInParameters.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithFilePathInParameters.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithFilePathInParameters.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithNumberOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithNumberOptions.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithNumberOptions.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithNumberOptions.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithNumberOptions.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithPipeOptionSeparator.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithPipeOptionSeparator.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithPipeOptionSeparator.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithPipeOptionSeparator.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithPipeOptionSeparator.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptions.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptions.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptions.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptions.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsSeparated.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsSeparated.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsSeparated.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsSeparated.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsSeparated.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsWithValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsWithValue.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsWithValue.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSeveralOptionsWithValue.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSeveralOptionsWithValue.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOption.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOption.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOption.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSimpleOption.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOption.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOptionWithValue.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOptionWithValue.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOptionWithValue.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithSimpleOptionWithValue.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithSimpleOptionWithValue.txt
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithoutOptions.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithoutOptions.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.txt b/plugins/performanceTesting/scripts-ui/testData/parser/CommandWithoutOptions.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/CommandWithoutOptions.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/CommandWithoutOptions.txt
diff --git a/plugins/performanceTesting/core/testData/parser/SimpleExample.ijperf b/plugins/performanceTesting/scripts-ui/testData/parser/SimpleExample.ijperf
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/SimpleExample.ijperf
rename to plugins/performanceTesting/scripts-ui/testData/parser/SimpleExample.ijperf
diff --git a/plugins/performanceTesting/core/testData/parser/SimpleExample.txt b/plugins/performanceTesting/scripts-ui/testData/parser/SimpleExample.txt
similarity index 100%
rename from plugins/performanceTesting/core/testData/parser/SimpleExample.txt
rename to plugins/performanceTesting/scripts-ui/testData/parser/SimpleExample.txt
diff --git a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfCompletionTest.java
similarity index 95%
rename from plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
rename to plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfCompletionTest.java
index a7826dcf995c..895b1ce4596f 100644
--- a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/completion/IJPerfCompletionTest.java
+++ b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfCompletionTest.java
@@ -1,12 +1,11 @@
-package com.jetbrains.performancePlugin.lang.completion;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.performancePlugin.CommandProvider;
-import com.jetbrains.performancePlugin.TestUtil;
-import com.jetbrains.performancePlugin.lang.IJPerfFileType;
+import junit.framework.TestCase;
 import org.junit.Assert;
 
 import java.util.ArrayList;
@@ -73,7 +72,7 @@ public class IJPerfCompletionTest extends BasePlatformTestCase {
     Assert.assertNotNull(lookupElements);
     List<String> expectedCommands = new ArrayList<>(CommandProvider.getAllCommandNames());
     List<String> strings = myFixture.getLookupElementStrings();
-    assertTrue(strings.containsAll(expectedCommands));
+    TestCase.assertTrue(strings.containsAll(expectedCommands));
   }
 
   public void testOnCommand() {
diff --git a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfLexerTest.java
similarity index 89%
rename from plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
rename to plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfLexerTest.java
index fd00eb0119e7..6566d574a1aa 100644
--- a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/lexer/IJPerfLexerTest.java
+++ b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfLexerTest.java
@@ -1,10 +1,9 @@
-package com.jetbrains.performancePlugin.lang.lexer;
+package com.jetbrains.performanceScripts.lang;
 
 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;
+import com.jetbrains.performanceScripts.lang.lexer.IJPerfLexerAdapter;
 import org.jetbrains.annotations.NotNull;
 
 public class IJPerfLexerTest extends LexerTestCase {
diff --git a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfParserTest.java
similarity index 83%
rename from plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
rename to plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfParserTest.java
index aa5fd57c4357..86536dc65499 100644
--- a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/lang/parser/IJPerfParserTest.java
+++ b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/IJPerfParserTest.java
@@ -1,10 +1,7 @@
-package com.jetbrains.performancePlugin.lang.parser;
+package com.jetbrains.performanceScripts.lang;
 
 import com.intellij.openapi.application.PathManager;
 import com.intellij.testFramework.ParsingTestCase;
-import com.jetbrains.performancePlugin.TestUtil;
-import com.jetbrains.performancePlugin.lang.IJPerfFileType;
-import com.jetbrains.performancePlugin.lang.IJPerfParserDefinition;
 import org.jetbrains.annotations.NonNls;
 
 public class IJPerfParserTest extends ParsingTestCase {
diff --git a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/TestUtil.java b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/TestUtil.java
similarity index 60%
rename from plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/TestUtil.java
rename to plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/TestUtil.java
index 7c36b6ab906f..b986562fae4e 100644
--- a/plugins/performanceTesting/core/testSrc/com/jetbrains/performancePlugin/TestUtil.java
+++ b/plugins/performanceTesting/scripts-ui/testSrc/com/jetbrains/performanceScripts/lang/TestUtil.java
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin;
+package com.jetbrains.performanceScripts.lang;
 
 import org.jetbrains.annotations.NonNls;
 
@@ -9,6 +9,6 @@ public final class TestUtil {
 
   @NonNls
   public static String getDataSubPath(@NonNls String theme) {
-    return "/plugins/performanceTesting/core/testData/" + theme;
+    return "/plugins/performanceTesting/scripts-ui/testData/" + theme;
   }
 }