[533848] Merged patternlanguage.emf and tooling.ui plugins

Change-Id: Ica1968a3be72bf25daecd7abc57cfb641a81d509
Signed-off-by: Zoltan Ujhelyi <zoltan.ujhelyi@incquerylabs.com>

167 files changed, 1307 insertions, 1417 deletions

diff --git a/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui.zest/META-INF/MANIFEST.MF b/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui.zest/META-INF/MANIFEST.MF
index af64aa97b..28f2be05e 100644
--- a/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui.zest/META-INF/MANIFEST.MF
+++ b/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui.zest/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: Eclipse VIATRA Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.viatra.query.runtime;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.viewers.runtime;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.viewers.tooling.ui;bundle-version="[2.1.0,2.2.0)",
diff --git a/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/META-INF/MANIFEST.MF b/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/META-INF/MANIFEST.MF
index de8c6898e..39e571918 100644
--- a/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/META-INF/MANIFEST.MF
+++ b/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.viatra.query.runtime;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.emf.edit;bundle-version="2.7.0",
  org.eclipse.emf.edit.ui;bundle-version="2.7.0",
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)"
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.viatra.addon.viewers.tooling.ui.views.tabs
diff --git a/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/plugin.xml b/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/plugin.xml
index f0792b531..4aa7eb1f9 100644
--- a/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/plugin.xml
+++ b/addon/plugins/org.eclipse.viatra.addon.viewers.tooling.ui/plugin.xml
@@ -31,7 +31,7 @@
       <view
             category="org.eclipse.viatra.query.tooling.ui"
             class="org.eclipse.viatra.addon.viewers.tooling.ui.views.ViewersMultiSandboxView"
-            icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+            icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png"
             id="org.eclipse.viatra.addon.viewers.tooling.ui.sandbox"
             name="Viewers Sandbox"
             restorable="true">
diff --git a/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml b/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
index 16f9a68a5..f1bc1a9cc 100644
--- a/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
+++ b/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
@@ -105,13 +105,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.viatra.query.tooling.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.viatra.query.patternlanguage.emf.ui"
          download-size="0"
          install-size="0"
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/META-INF/MANIFEST.MF
index 94d371719..9ce18fab0 100755
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
  org.eclipse.viatra.query.runtime;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.xtext.ui.shared;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.xtext.common.types.ui;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.viatra.query.patternlanguage.metamodel;bundle-version="[0.21.0,0.22.0)",
@@ -35,7 +34,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius.ui.editor;bundle-version="[6.0.0,7.0.0)",
  org.eclipse.jdt.ui,
  org.eclipse.jdt.core,
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.validation.core;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.validation.runtime;bundle-version="[2.1.0,2.2.0)",
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/plugin.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/plugin.xml
index c39ce9236..3276bb800 100755
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/plugin.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/plugin.xml
@@ -13,7 +13,7 @@
             category="org.eclipse.viatra.query.tooling.ui.category"
             class="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.patternlanguage.emf.sirius.wizard.NewProjectWizard"
             finalPerspective="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
-            icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+            icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png"
             id="org.eclipse.viatra.query.tooling.ui.newproject"
             name="Graphical Query Project"
             preferredPerspectives="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective,org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective"
@@ -23,7 +23,7 @@
               category="org.eclipse.viatra.query.tooling.ui.category"
               class="org.eclipse.viatra.query.patternlanguage.emf.sirius.wizard.NewVgqlFileWizard"
               finalPerspective="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
-              icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+              icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png"
               id="org.eclipse.viatra.query.patternlanguage.emf.sirius.newvgqlwizard"
               name="Graphical Query Definition"
               project="false">
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/src/org/eclipse/viatra/query/patternlanguage/emf/sirius/wizard/NewVgqlFileWizard.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/src/org/eclipse/viatra/query/patternlanguage/emf/sirius/wizard/NewVgqlFileWizard.java
index b59c6b2eb..51f854355 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/src/org/eclipse/viatra/query/patternlanguage/emf/sirius/wizard/NewVgqlFileWizard.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.sirius/src/org/eclipse/viatra/query/patternlanguage/emf/sirius/wizard/NewVgqlFileWizard.java
@@ -47,9 +47,9 @@ import org.eclipse.sirius.ui.business.internal.commands.ChangeViewpointSelection
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.patternlanguage.metamodel.vgql.PatternPackage;
 import org.eclipse.viatra.query.patternlanguage.metamodel.vgql.VgqlFactory;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 
 /**
  * A wizard implementation used to create new eiq files.
@@ -106,7 +106,7 @@ public class NewVgqlFileWizard extends Wizard implements INewWizard {
             return false;
         } catch (InvocationTargetException e) {
             Throwable realException = e.getTargetException();
-            ViatraQueryGUIPlugin.getDefault().logException(
+            EMFPatternLanguageUIPlugin.getInstance().logException(
                     "Cannot create Query Definition file: " + realException.getMessage(), realException);
             MessageDialog.openError(getShell(), "Error", realException.getMessage());
             return false;
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.classpath b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.classpath
index 309f8a6e4..0030bd131 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.classpath
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry excluding="**.gitignore" kind="src" path="src-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.project b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.project
index 52a7abd49..fa20c2811 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.project
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -30,5 +35,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.settings/.api_filters b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.settings/.api_filters
index c79b8b786..b5dd0d522 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.settings/.api_filters
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/.settings/.api_filters
@@ -426,4 +426,84 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/queryexplorer/AbstractBackendSelectionControl.java" type="org.eclipse.viatra.query.tooling.ui.queryexplorer.AbstractBackendSelectionControl">
+        <filter comment="Moved in from tooling project" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.3"/>
+                <message_argument value="2.1"/>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.queryexplorer.AbstractBackendSelectionControl"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/queryexplorer/adapters/VQLEditorModelConnector.java" type="org.eclipse.viatra.query.tooling.ui.queryexplorer.adapters.VQLEditorModelConnector">
+        <filter comment="Moved in from tooling project" id="1110441988">
+            <message_arguments>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.queryexplorer.adapters.VQLEditorModelConnector"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java" type="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.PatternInitializationPreferencePage">
+        <filter comment="Moved from tooling project" id="1110441988">
+            <message_arguments>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.PatternInitializationPreferencePage"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PreferenceConstants.java" type="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.PreferenceConstants">
+        <filter comment="Moved from tooling project" id="1110441988">
+            <message_arguments>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.PreferenceConstants"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/RuntimePreferencesInterpreter.java" type="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.RuntimePreferencesInterpreter">
+        <filter comment="Moved from other plugin" id="1108344834">
+            <message_arguments>
+                <message_argument value="2.0"/>
+                <message_argument value="2.1"/>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.RuntimePreferencesInterpreter"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/queryexplorer/util/CommandConstants.java" type="org.eclipse.viatra.query.tooling.ui.queryexplorer.util.CommandConstants">
+        <filter comment="Moved in from tooling project" id="1110441988">
+            <message_arguments>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.queryexplorer.util.CommandConstants"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/util/CommandInvokingDoubleClickListener.java" type="org.eclipse.viatra.query.tooling.ui.util.CommandInvokingDoubleClickListener">
+        <filter comment="Moved in from tooling project" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.4"/>
+                <message_argument value="2.1"/>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.util.CommandInvokingDoubleClickListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherCollection.java" type="org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherCollection">
+        <filter comment="Moved in from tooling project" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.4"/>
+                <message_argument value="2.1"/>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherCollection"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherContent.java" type="org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherContent">
+        <filter comment="Moved in from tooling project" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.4"/>
+                <message_argument value="2.1"/>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherContent"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/viatra/query/tooling/ui/util/IModelConnectorListener.java" type="org.eclipse.viatra.query.tooling.ui.util.IModelConnectorListener">
+        <filter comment="Moved in from tooling project" id="1110441988">
+            <message_arguments>
+                <message_argument value="org.eclipse.viatra.query.tooling.ui.util.IModelConnectorListener"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/META-INF/MANIFEST.MF
index 14706068d..79d13cd65 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/META-INF/MANIFEST.MF
@@ -25,19 +25,35 @@ Require-Bundle: org.eclipse.viatra.query.patternlanguage.emf;bundle-version="0.8
  com.google.inject;bundle-version="3.0.0",
  org.eclipse.jdt.debug.ui,
  org.eclipse.viatra.documentation.help;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.patternlanguage.emf.ide;bundle-version="[2.1.0,2.2.0)"
+ org.eclipse.viatra.query.patternlanguage.emf.ide;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.tooling.generator.model;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.viatra.query.runtime.ui;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.jdt.ui,
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.runtime.rete;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.core.databinding,
+ org.eclipse.jface.databinding,
+ org.eclipse.core.databinding.property,
+ org.eclipse.core.databinding.beans,
+ org.eclipse.core.expressions
 Import-Package: com.google.inject.multibindings,
  org.apache.log4j;version="1.2.15",
  org.apache.log4j.spi;version="1.2.15"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.viatra.query.patternlanguage.emf.ui;
-  uses:="com.google.inject",
- org.eclipse.viatra.query.patternlanguage.emf.ui.builder;
-  uses:="com.google.common.base",
+Export-Package: org.eclipse.viatra.query.patternlanguage.emf.ui;uses:="com.google.inject",
+ org.eclipse.viatra.query.patternlanguage.emf.ui.builder;uses:="com.google.common.base",
  org.eclipse.viatra.query.patternlanguage.emf.ui.contentassist,
  org.eclipse.viatra.query.patternlanguage.emf.ui.internal;uses:="com.google.inject",
- org.eclipse.viatra.query.patternlanguage.emf.ui.types;
-  uses:="com.google.common.base",
- org.eclipse.viatra.query.patternlanguage.emf.ui.util
+ org.eclipse.viatra.query.patternlanguage.emf.ui.types;uses:="com.google.common.base",
+ org.eclipse.viatra.query.patternlanguage.emf.ui.util,
+ org.eclipse.viatra.query.tooling.ui.queryexplorer,
+ org.eclipse.viatra.query.tooling.ui.queryexplorer.adapters,
+ org.eclipse.viatra.query.tooling.ui.queryexplorer.preference,
+ org.eclipse.viatra.query.tooling.ui.queryexplorer.util,
+ org.eclipse.viatra.query.tooling.ui.queryregistry.index;x-friends:="org.eclipse.viatra.query.patternlanguage.emf.sirius",
+ org.eclipse.viatra.query.tooling.ui.queryresult;x-friends:="org.eclipse.viatra.query.patternlanguage.emf.sirius",
+ org.eclipse.viatra.query.tooling.ui.util
 Bundle-Activator: org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 Automatic-Module-Name: org.eclipse.viatra.query.patternlanguage.emf.ui
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/build.properties b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/build.properties
index b5f10ff2e..c6f44c2f1 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/build.properties
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/build.properties
@@ -1,9 +1,12 @@
 source.. = src/,\
-          src-gen/
+           src-gen/,\
+           xtend-gen/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
                templates/,\
-               about.html
+               about.html,\
+               cheatsheets/
 src.includes = about.html
+output.. = bin/
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/gencode.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/gencode.xml
index 18b5d0517..18b5d0517 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/gencode.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/gencode.xml
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/gettingstarted.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/gettingstarted.xml
index 22d9d089a..22d9d089a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/gettingstarted.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/gettingstarted.xml
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/newproject.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/newproject.xml
index 50356cf9d..50356cf9d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/newproject.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/newproject.xml
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/queries.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/queries.xml
index d5fc718d6..d5fc718d6 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/cheatsheets/queries.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/cheatsheets/queries.xml
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_bottom.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_bottom.gif
index 4a2df3fd2..4a2df3fd2 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_bottom.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_bottom.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_left.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_left.gif
index 9f7018ea7..9f7018ea7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_left.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_left.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_right.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_right.gif
index 56fb7de23..56fb7de23 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_right.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_right.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_top.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_top.gif
index eb4e5c262..eb4e5c262 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/arrow_top.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/arrow_top.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/base_options.png
index 2ad97a665..2ad97a665 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/base_options.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@1.5x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/base_options@1.5x.png
index b8ecc5b17..b8ecc5b17 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/base_options@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@2x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/base_options@2x.png
index a4369a196..a4369a196 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/base_options@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/eiq.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/eiq.png
index 9d8c75c77..9d8c75c77 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/eiq.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/eiq.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/engine_options.png
index 4b179188d..4b179188d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/engine_options.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@1.5x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/engine_options@1.5x.png
index 46da7f487..46da7f487 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/engine_options@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@2x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/engine_options@2x.png
index c74f1ddf2..c74f1ddf2 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/engine_options@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/epackage.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/epackage.gif
index 30c5c10cc..30c5c10cc 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/epackage.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/epackage.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/error.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/error.gif
index 2ff667899..2ff667899 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/error.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/error.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/flatLayout.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/flatLayout.gif
index 1ef74cf98..1ef74cf98 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/flatLayout.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/flatLayout.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/forward_nav.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/forward_nav.gif
index e2f8c3e1f..e2f8c3e1f 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/forward_nav.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/forward_nav.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/hierarchicalLayout.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/hierarchicalLayout.gif
index 234486172..234486172 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/hierarchicalLayout.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/hierarchicalLayout.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load.gif
index ec477ea43..ec477ea43 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_model.png
index d1f20378c..d1f20378c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_model.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@1.5x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_model@1.5x.png
index 464449343..464449343 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_model@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@2x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_model@2x.png
index 55e01dd90..55e01dd90 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_model@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_query.png
index 62c796821..62c796821 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_query.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@1.5x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_query@1.5x.png
index 5742c301e..5742c301e 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_query@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@2x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_query@2x.png
index 37fd9872a..37fd9872a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/load_query@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo.png
index 4649500c9..4649500c9 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png
index 455850162..455850162 100755
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2@1.5x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2@1.5x.png
index 532d6244a..532d6244a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2@2x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2@2x.png
index 9ea3e78ba..9ea3e78ba 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2_old.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2_old.png
index 4649500c9..4649500c9 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/logo2_old.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2_old.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/match.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/match.gif
index 92075a8a3..92075a8a3 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/match.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/match.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/matcher.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/matcher.gif
index f529c5a42..f529c5a42 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/matcher.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/matcher.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/pin.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/pin.gif
index 61bb1709b..61bb1709b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/pin.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/pin.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/reset.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/reset.gif
index 9db17b803..9db17b803 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/reset.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/reset.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/root.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/root.gif
index 5ba5b91c5..5ba5b91c5 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/root.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/root.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/rsz_viatra_logo.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/rsz_viatra_logo.png
index 1302144b0..1302144b0 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/rsz_viatra_logo.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/rsz_viatra_logo.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/rsz_viatra_logo@1.5x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/rsz_viatra_logo@1.5x.png
index 875182efd..875182efd 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/rsz_viatra_logo@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/rsz_viatra_logo@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/rsz_viatra_logo@2x.png b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/rsz_viatra_logo@2x.png
index a830c0b9b..a830c0b9b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/rsz_viatra_logo@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/rsz_viatra_logo@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/sample.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/sample.gif
index 34fb3c9d8..34fb3c9d8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/sample.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/sample.gif
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/unload.gif b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/unload.gif
index b6922ac11..b6922ac11 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/unload.gif
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/unload.gif
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/plugin.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/plugin.xml
index e65c3cc01..e4cd32131 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/plugin.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/plugin.xml
@@ -10,7 +10,7 @@
               contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
               default="true"
               extensions="vql"
-              icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+              icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png"
               id="org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage"
               matchingStrategy="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.xtext.xbase.ui.editor.JavaEditorInputMatcher"
               name="VIATRA Query Editor">
@@ -588,4 +588,984 @@
     </fileTypes>
   </extension>
 
+ <extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.viatra.query.tooling.ui.category"
+            name="VIATRA">
+      </category>
+      <wizard
+            category="org.eclipse.viatra.query.tooling.ui.category"
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.wizards.NewProjectWizard"
+            finalPerspective="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
+            icon="icons/logo2.png"
+            id="org.eclipse.viatra.query.tooling.ui.newproject"
+            name="Query Project"
+            preferredPerspectives="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective,org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective"
+            project="true">
+      </wizard>
+      <wizard
+            category="org.eclipse.viatra.query.tooling.ui.category"
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.wizards.NewVqlFileWizard"
+            finalPerspective="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
+            icon="icons/logo2.png"
+            id="org.eclipse.viatra.query.tooling.ui.newvqlfile"
+            name="Query Definition "
+            preferredPerspectives="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective,org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective">
+      </wizard>
+      <wizard
+            category="org.eclipse.viatra.query.tooling.ui.category"
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.wizards.NewGenmodelWizard"
+            icon="icons/logo2.png"
+            id="org.eclipse.viatra.query.tooling.ui.newvqlgenmodel"
+            name="Query Generator Model"
+            project="false">
+      </wizard>
+   </extension>
+   <extension
+         point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+      <category
+            id="org.eclipse.viatra"
+            name="VIATRA">
+      </category>
+      <cheatsheet
+            category="org.eclipse.viatra"
+            composite="true"
+            contentFile="cheatsheets/gettingstarted.xml"
+            id="org.eclipse.viatra.query.tooling.ui.cheatsheet"
+            name="Getting Started with VIATRA Query">
+      </cheatsheet>
+   </extension>
+<extension
+         point="org.eclipse.ui.views">
+      <category
+            id="org.eclipse.viatra.query.tooling.ui"
+            name="VIATRA">
+      </category>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.jdt.ui.JavaPerspective">
+         <newWizardShortcut
+               id="org.eclipse.viatra.query.tooling.ui.newvqlfile">
+         </newWizardShortcut>
+      </perspectiveExtension>
+      <perspectiveExtension
+            targetID="org.eclipse.pde.ui.PDEPerspective">
+         <newWizardShortcut
+               id="org.eclipse.viatra.query.tooling.ui.newvqlfile">
+         </newWizardShortcut>
+      </perspectiveExtension>
+      <perspectiveExtension
+            targetID="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
+         <view
+               id="org.eclipse.jdt.ui.TypeHierarchy"
+               minimized="false"
+               visible="false"
+               relationship="stack"
+               relative="org.eclipse.ui.navigator.ProjectExplorer">
+         </view>
+         <view
+               id="org.eclipse.jdt.ui.PackageExplorer"
+               minimized="false"
+               visible="false"
+               relationship="stack"
+               relative="org.eclipse.ui.navigator.ProjectExplorer">
+         </view>
+         <view
+               id="org.eclipse.ui.views.PropertySheet"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.ProblemView">
+         </view>
+         <view
+               id="org.eclipse.amalgam.explorer.contextual.ui.view.ExplorerContextualID"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.PropertySheet">
+         </view>
+         <view
+               id="org.eclipse.ui.console.ConsoleView"
+               minimized="false"
+               visible="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.PropertySheet">
+         </view>
+         <view
+               id="org.eclipse.ui.views.BookmarkView"
+               minimized="false"
+               visible="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.PropertySheet">
+         </view>
+         <view
+               id="org.eclipse.ui.views.ProgressView"
+               minimized="false"
+               visible="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.PropertySheet">
+         </view>
+         <viewShortcut
+               id="org.eclipse.ui.views.PropertySheet">
+         </viewShortcut>
+         <viewShortcut
+               id="org.eclipse.ui.views.ProblemView">
+         </viewShortcut>
+         <viewShortcut
+               id="org.eclipse.jdt.ui.PackageExplorer">
+         </viewShortcut>
+         <newWizardShortcut
+               id="org.eclipse.viatra.query.tooling.ui.newproject">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.viatra.query.tooling.ui.newvqlfile">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.viatra.query.tooling.ui.newvqlgenmodel">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.xtend.ide.wizards.NewXtendClassWizard">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.xtend.ide.wizards.NewXtendInterfaceWizard">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.pde.ui.NewProjectWizard">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.ui.wizards.new.folder">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.ui.wizards.new.file">
+         </newWizardShortcut>
+         <actionSet
+               id="org.eclipse.debug.ui.launchActionSet">
+         </actionSet>
+      </perspectiveExtension>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.vql.file">
+         <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false">
+               <adapt
+                     type="org.eclipse.core.resources.IFile">
+                  <test
+                        property="org.eclipse.core.resources.name"
+                        value="*.vql">
+                  </test>
+               </adapt>
+            </iterate>
+         </with>
+      </definition>
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.activepatterneditor">
+         <with
+               variable="activeEditorId">
+            <equals
+                  value="org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage">
+            </equals>
+         </with>
+      </definition>
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.filteredmatchercontent">
+            <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false">
+               <instanceof
+                     value="org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherContent">
+               </instanceof>
+            </iterate>
+         </with>
+      </definition>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.loadmodel"
+            name="Load model">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.showlocation"
+            name="Show location">
+      </command>
+      <category
+            description="Commands related to VIATRA"
+            id="org.eclipse.viatra.query.tooling.category"
+            name="VIATRA">
+      </category>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.showlocation_patternreg"
+            name="Show location">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.viatra.query.tooling.ui.viatra"
+            class="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.PatternInitializationPreferencePage"
+            id="org.eclipse.viatra.query.tooling.ui.queryexplorer"
+            name="Query Explorer">
+         <keywordReference
+               id="org.eclipse.viatra.query.patternlanguage.emf.ui.keyword_EMFPatternLanguage">
+         </keywordReference>
+      </page>
+      <page
+            class="org.eclipse.viatra.query.tooling.ui.preferences.RootPreferencePage"
+            id="org.eclipse.viatra.query.tooling.ui.viatra"
+            name="VIATRA">
+      </page>
+      <page
+            category="org.eclipse.viatra.query.tooling.ui.viatra"
+            class="org.eclipse.viatra.query.tooling.ui.preferences.ToolingCorePreferencePage"
+            id="org.eclipse.viatra.query.tooling.ui.preferences.ToolingCorePreferencePage"
+            name="Query Tooling">
+         <keywordReference
+               id="org.eclipse.viatra.query.patternlanguage.emf.ui.keyword_EMFPatternLanguage">
+         </keywordReference>
+      </page>
+   </extension>
+   <extension
+         id="org.eclipse.viatra.query.tooling.ui.projectbuilder"
+         name="VIATRA Query Project Builder"
+         point="org.eclipse.core.resources.builders">
+      <builder
+            hasNature="true">
+         <run
+               class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory">
+               <parameter name="guicekey" value="org.eclipse.viatra.query.tooling.ui.builder.ViatraQueryProjectBuilder"/>
+         </run></builder>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="org.eclipse.viatra.query.tooling.ui.perspective.TransformationDevelopmentPerspective"
+            icon="icons/rsz_viatra_logo.png"
+            id="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
+            name="Transformation Development">
+      </perspective>
+   </extension>
+   <extension
+         point="org.eclipse.ui.navigator.navigatorContent">
+      <commonWizard
+            menuGroupId="org.eclipse.viatra"
+            type="new"
+            wizardId="org.eclipse.viatra.query.tooling.ui.newproject">
+         <enablement>
+            <with
+                  variable="activeWorkbenchWindow.activePerspective">
+               <equals
+                     value="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
+               </equals>
+            </with></enablement>
+      </commonWizard>
+      <commonWizard
+            menuGroupId="org.eclipse.viatra"
+            type="new"
+            wizardId="org.eclipse.viatra.query.tooling.ui.newvqlfile">
+         <enablement>
+            <with
+                  variable="activeWorkbenchWindow.activePerspective">
+               <equals
+                     value="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
+               </equals>
+            </with></enablement>
+      </commonWizard>
+   </extension>
+<extension
+         point="org.eclipse.ui.views">
+      <view
+            category="org.eclipse.viatra.query.tooling.ui"
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView"
+            icon="icons/logo2.png"
+            id="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView"
+            name="Query Registry">
+      </view>
+      <view
+            category="org.eclipse.viatra.query.tooling.ui"
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
+            icon="icons/logo2.png"
+            id="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
+            name="Query Results">
+      </view>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
+         <view
+               id="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView"
+               minimized="false"
+               relationship="stack"
+               relative="left">
+         </view>
+         <view
+               id="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
+               minimized="false"
+               relationship="stack"
+               relative="right">
+         </view>
+         <viewShortcut
+               id="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         </viewShortcut>
+         <viewShortcut
+               id="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
+         </viewShortcut>
+      </perspectiveExtension>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.viatra.query.tooling.ui.queryregistry.handlers.ResetViewHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.registry.reset">
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryregistry.handlers.ShowLocationHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.showlocation">
+         <activeWhen>
+            <reference
+                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadResourceSetHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.loadmodel">
+         <enabledWhen>
+           <reference
+                 definitionId="org.eclipse.viatra.query.runtime.ui.activedomaineditor">
+           </reference>
+         </enabledWhen>
+         <activeWhen>
+            <not>
+               <reference
+                     definitionId="org.eclipse.viatra.query.tooling.ui.activepatterneditor">
+               </reference>
+            </not>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadVqlPatternHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.loadvqlqueries">
+         <activeWhen>
+            <reference
+                 definitionId="org.eclipse.viatra.query.tooling.ui.activepatterneditor">
+            </reference>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="activeEditor">
+               <test
+                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
+               </test>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadQueriesHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.loadqueries">
+         <activeWhen>
+            <reference
+              definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registrycontent">
+            </reference>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="activePart">
+               <test
+                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
+               </test>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.UnloadModelHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.unloadmodel">
+         <enabledWhen>
+            <with
+                  variable="activePart">
+               <instanceof
+                     value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
+               </instanceof>
+               <test
+                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
+               </test>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.WipeEngineHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.wipeengine">
+         <enabledWhen>
+            <with
+                  variable="activePart">
+               <instanceof
+                     value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
+               </instanceof>
+               <test
+                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
+               </test>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryregistry.handlers.ShowLocationHandler"
+            commandId="org.eclipse.jdt.ui.edit.text.java.open.editor">
+         <activeWhen>
+            <reference
+                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.ShowMatcherLocationHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.showlocation">
+         <activeWhen>
+            <reference
+                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatcher">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.ShowMatchLocationHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.showlocation">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <iterate
+                     ifEmpty="false">
+                  <or>
+                     <instanceof
+                           value="org.eclipse.emf.ecore.EObject">
+                     </instanceof>
+                     <instanceof
+                           value="org.eclipse.viatra.query.runtime.api.IPatternMatch">
+                     </instanceof>
+                  </or>
+               </iterate>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.RemoveQueryHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.removequery">
+         <activeWhen>
+            <reference
+                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatchers">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.OpenManagedEngineHandler"
+            commandId="org.eclipse.viatra.query.tooling.ui.result.openmanaged">
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.registry.reset"
+               icon="platform:/plugin/org.eclipse.jdt.ui/icons/full/elcl16/refresh.png"
+               label="Reset view"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.showlocation"
+               icon="platform:/plugin/org.eclipse.ui.ide/icons/full/elcl16/gotoobj_tsk.png"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <reference
+                        definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.loadqueries"
+               icon="icons/load_query.png"
+               id="org.eclipse.viatra.query.tooling.ui.result.loadqueriesmenu"
+               label="Load into Query Results"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <reference
+                     definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registrycontent">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="toolbar:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
+         <control
+               class="org.eclipse.viatra.query.tooling.ui.queryresult.BackendSelectionControl">
+         </control>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.loadmodel"
+               icon="icons/load_model.png"
+               id="org.eclipse.viatra.query.tooling.ui.result.loadmodelmenu"
+               label="Load model from active editor"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.loadvqlqueries"
+               icon="icons/load_query.png"
+               label="Load queries from active editor"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.ui.navigate.collapseAll"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.unloadmodel"
+               icon="platform:/plugin/org.eclipse.ui/icons/full/elcl16/stop.png"
+               label="Unload model"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.wipeengine"
+               icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete_edit.png"
+               label="Remove loaded queries"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.openmanaged"
+               icon="icons/logo2.png"
+               label="Open managed engine"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="toolbar:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         <command
+               commandId="org.eclipse.ui.navigate.collapseAll"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.showlocation"
+               icon="platform:/plugin/org.eclipse.ui.ide/icons/full/elcl16/gotoobj_tsk.png"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <reference
+                     definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultcontent">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.ui.result.removequery"
+               icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete_edit.png"
+               label="Remove query"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <reference
+                     definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatchers">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.registry.reset"
+            name="Reset view">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.loadmodel"
+            name="Load model from active editor">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.openmanaged"
+            name="Open managed engine">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.loadvqlqueries"
+            name="Load queries from active editor">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.loadqueries"
+            name="Load into Query Results">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.unloadmodel"
+            name="Unload model">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.wipeengine"
+            name="Remove loaded queries">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.ui.result.removequery"
+            name="Remove query">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
+      <propertyContributor
+            contributorId="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         <propertyCategory
+               category="org.eclipse.viatra.query.tooling.ui.propertiesCategory">
+         </propertyCategory>
+      </propertyContributor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
+      <propertyContributor
+            contributorId="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
+            tabDescriptorProvider="org.eclipse.viatra.query.tooling.ui.queryresult.properties.QueryResultTreeTabDescriptorProvider">
+         <propertyCategory
+               category="org.eclipse.viatra.query.tooling.ui.result.propertiesCategory">
+         </propertyCategory>
+      </propertyContributor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
+      <propertyTabs
+            contributorId="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         <propertyTab
+               category="org.eclipse.viatra.query.tooling.ui.propertiesCategory"
+               id="org.eclipse.viatra.query.tooling.ui.properties.specification"
+               label="Query">
+         </propertyTab>
+         <propertyTab
+               afterTab="org.eclipse.viatra.query.tooling.ui.properties.specification"
+               category="org.eclipse.viatra.query.tooling.ui.propertiesCategory"
+               id="org.eclipse.viatra.query.tooling.ui.properties.specification.advanced"
+               indented="true"
+               label="Advanced">
+         </propertyTab>
+      </propertyTabs>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertySections">
+      <propertySections
+            contributorId="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
+         <propertySection
+               class="org.eclipse.viatra.query.tooling.ui.queryregistry.properties.QuerySpecificationPropertySection"
+               enablesFor="1"
+               id="org.eclipse.viatra.query.tooling.ui.properties.specification.section"
+               tab="org.eclipse.viatra.query.tooling.ui.properties.specification">
+            <input
+                  type="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
+            </input>
+         </propertySection>
+         <propertySection
+               class="org.eclipse.ui.views.properties.tabbed.AdvancedPropertySection"
+               enablesFor="1"
+               id="org.eclipse.ui.views.properties.tabbed.AdvancedPropertySection"
+               tab="org.eclipse.viatra.query.tooling.ui.properties.specification.advanced">
+            <input
+                  type="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
+            </input>
+         </propertySection>
+      </propertySections>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry"
+            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
+         <adapter
+               type="org.eclipse.ui.views.properties.IPropertySource">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryEntry"
+            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
+         <adapter
+               type="org.eclipse.ui.views.properties.IPropertySource">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher"
+            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
+         <adapter
+               type="org.eclipse.ui.views.properties.IPropertySource">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.viatra.query.runtime.api.IPatternMatch"
+            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
+         <adapter
+               type="org.eclipse.ui.views.properties.IPropertySource">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.emf.ecore.EObject"
+            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
+         <adapter
+               type="org.eclipse.ui.views.properties.IPropertySource">
+         </adapter>
+      </factory>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
+        <with
+           variable="selection">
+        <and>
+              <count
+                    value="1">
+              </count>
+              <iterate>
+                 <instanceof
+                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
+                 </instanceof>
+              </iterate>
+           </and>
+        </with>
+      </definition>
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.browser.selection.registrycontent">
+        <with
+              variable="selection">
+           <iterate
+                 ifEmpty="false">
+              <or>
+                 <instanceof
+                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeSource">
+                 </instanceof>
+                 <instanceof
+                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreePackage">
+                 </instanceof>
+                 <instanceof
+                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
+                 </instanceof>
+              </or>
+           </iterate>
+        </with>
+      </definition>
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.browser.selection.resultcontent">
+         <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false">
+               <or>
+                  <instanceof
+                        value="org.eclipse.emf.ecore.EObject">
+                  </instanceof>
+                  <instanceof
+                        value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher">
+                  </instanceof>
+                  <instanceof
+                        value="org.eclipse.viatra.query.runtime.api.IPatternMatch">
+                  </instanceof>
+               </or>
+            </iterate>
+         </with>
+      </definition>
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatcher">
+         <with
+               variable="selection">
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <instanceof
+                        value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher">
+                  </instanceof>
+               </iterate>
+            </and>
+         </with>
+      </definition>
+      <definition
+            id="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatchers">
+         <with
+               variable="selection">
+            <and>
+               <iterate>
+                  <instanceof
+                        value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher">
+                  </instanceof>
+               </iterate>
+            </and>
+         </with>
+      </definition>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.viatra.query.tooling.ui.queryresult.internal.ActiveEnginePropertyTester"
+            id="org.eclipse.viatra.query.tooling.ui.browser.result"
+            namespace="org.eclipse.viatra.query.tooling.ui.browser.result"
+            properties="activeengine"
+            type="java.lang.Object">
+      </propertyTester>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.migrator.api.command"
+            name="Migrate IncQuery API to VIATRA Queries">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.migrator.metadata.command"
+            name="Add VIATRA Query Nature">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.ui.projectConfigure?after=additions">
+         <command
+               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
+               icon="icons/logo2.png"
+               label="Update Query Project"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <iterate>
+                  <adapt
+                           type="org.eclipse.core.resources.IProject">
+                     <and>
+                        <test
+                              property="org.eclipse.core.resources.open"
+                              value="true">
+                        </test>
+                        <test
+                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
+                        </test>
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.incquery.projectnature">
+                        </test>
+                     </and>
+                  </adapt>
+               </iterate>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
+               icon="icons/logo2.png"
+               label="Convert to VIATRA Query Project"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <iterate>
+                  <adapt
+                           type="org.eclipse.core.resources.IProject">
+                     <and>
+                        <test
+                              property="org.eclipse.core.resources.open"
+                              value="true">
+                        </test>
+                        <test
+                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
+                        </test>
+                        <not>
+                           <test
+                                 property="org.eclipse.core.resources.projectNature"
+                                 value="org.eclipse.incquery.projectnature">
+                           </test>
+                        </not>
+                     </and>
+                  </adapt>
+               </iterate>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.migrator.api.command"
+               icon="icons/logo2.png"
+               label="Replace EMF-IncQuery API Usage"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                     <and>
+                        <test
+                              property="org.eclipse.core.resources.open"
+                              value="true">
+                        </test>
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.jdt.core.javanature">
+                        </test>
+                        <not>
+                           <and>
+                              <test
+                                    property="org.eclipse.viatra.query.tooling.migrator.outdated">
+                              </test>
+                              <test
+                                    property="org.eclipse.core.resources.projectNature"
+                                    value="org.eclipse.viatra.query.projectnature">
+                              </test>
+                           </and>
+                        </not>
+                     </and>
+                  </adapt>
+               </iterate>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:org.eclipse.viatra.migrator.metadata.ProjectNatureUpdater"
+            commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command">
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.tooling.ui.migrator.MigrateProjectHandler"
+            commandId="org.eclipse.viatra.query.tooling.migrator.api.command">
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.viatra.query.tooling.ui.migrator.properties.QueryProjectVersionTester"
+            id="org.eclipse.viatra.query.tooling.migrator.projectPropertyTester"
+            namespace="org.eclipse.viatra.query.tooling.migrator"
+            properties="outdated"
+            type="org.eclipse.core.resources.IProject">
+      </propertyTester>
+   </extension>
 </plugin>
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/pom.xml b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/pom.xml
index 5eed447e4..245c7adb6 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/pom.xml
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/pom.xml
@@ -10,4 +10,44 @@
     </parent>
   <artifactId>org.eclipse.viatra.query.patternlanguage.emf.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
+  <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+                <executions>
+                    <execution>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>xtend-gen</directory>
+                                    <excludes>
+                                        <exclude>.gitignore</exclude>
+                                    </excludes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>xtend-maven-plugin</artifactId>
+                <version>${xtend.compiler.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/patternlanguage/emf/ui/EMFPatternLanguageUIPlugin.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/patternlanguage/emf/ui/EMFPatternLanguageUIPlugin.java
index be12226bd..319feef40 100644
--- a/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/patternlanguage/emf/ui/EMFPatternLanguageUIPlugin.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/patternlanguage/emf/ui/EMFPatternLanguageUIPlugin.java
@@ -10,6 +10,12 @@
  *******************************************************************************/
 package org.eclipse.viatra.query.patternlanguage.emf.ui;
 
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguagePlugin;
 import org.eclipse.viatra.query.patternlanguage.emf.ui.internal.EmfActivator;
 import org.osgi.framework.BundleContext;
@@ -21,6 +27,71 @@ import org.osgi.framework.BundleContext;
  */
 public class EMFPatternLanguageUIPlugin extends EmfActivator {
 
+    /**
+     * @since 2.1
+     */
+    public static final String ID = "org.eclipse.viatra.query.patternlanguage.emf.ui";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ROOT = "navigator_root";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_MATCHER = "matcher";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_MATCH = "match";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ERROR = "error";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ARROW_RIGHT = "arrow_right";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ARROW_LEFT = "arrow_left";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_PIN = "pin";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ARROW_TOP = "arrow_top";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ARROW_BOTTOM = "arrow_bottom";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_EPACKAGE = "epackage";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_VQL = "vql";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_PROJECT = "project";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_VIATRA = "viatra";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_BASE_OPTIONS = "base_options";
+    /**
+     * @since 2.1
+     */
+    public static final String ICON_ENGINE_OPTIONS = "engine_options";
+    
     public static EMFPatternLanguageUIPlugin getInstance() {
         return (EMFPatternLanguageUIPlugin) EmfActivator.getInstance();
     }
@@ -31,4 +102,31 @@ public class EMFPatternLanguageUIPlugin extends EmfActivator {
         EMFPatternLanguagePlugin.getInstance().addCompoundInjector(getInjector(ORG_ECLIPSE_VIATRA_QUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE), EMFPatternLanguagePlugin.EDITOR_INJECTOR_PRIORITY);
     }
 
+    @Override
+    protected void initializeImageRegistry(ImageRegistry reg) {
+        super.initializeImageRegistry(reg);
+        reg.put(ICON_ROOT, imageDescriptorFromPlugin(JavaUI.ID_PLUGIN, "icons/full/eview16/types.png"));
+        reg.put(ICON_MATCHER, imageDescriptorFromPlugin("org.eclipse.debug.ui", "icons/full/eview16/breakpoint_view.png"));
+        reg.put(ICON_MATCH, imageDescriptorFromPlugin(JavaUI.ID_PLUGIN, "icons/full/obj16/methpub_obj.png"));
+        reg.put(ICON_ERROR, imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID, "icons/full/progress/errorstate.png"));
+        reg.put(ICON_PIN, imageDescriptorFromPlugin(ID, "icons/pin.gif"));
+        reg.put(ICON_ARROW_RIGHT, imageDescriptorFromPlugin(ID, "icons/arrow_right.gif"));
+        reg.put(ICON_ARROW_LEFT, imageDescriptorFromPlugin(ID, "icons/arrow_left.gif"));
+        reg.put(ICON_ARROW_TOP, imageDescriptorFromPlugin(ID, "icons/arrow_top.gif"));
+        reg.put(ICON_ARROW_BOTTOM, imageDescriptorFromPlugin(ID, "icons/arrow_bottom.gif"));
+        reg.put(ICON_EPACKAGE, imageDescriptorFromPlugin(ID, "icons/epackage.gif"));
+        reg.put(ICON_VQL, imageDescriptorFromPlugin(ID, "icons/logo2.png"));
+        reg.put(ICON_VIATRA, imageDescriptorFromPlugin(ID, "icons/rsz_viatra_logo.png"));
+        reg.put(ICON_PROJECT, imageDescriptorFromPlugin("org.eclipse.ui.ide", "icons/full/obj16/prj_obj.png"));
+        reg.put(ICON_BASE_OPTIONS, imageDescriptorFromPlugin(ID, "icons/base_options.png"));
+        reg.put(ICON_ENGINE_OPTIONS, imageDescriptorFromPlugin(ID, "icons/engine_options.png"));
+    }
+
+    /**
+     * @since 2.1
+     */
+    public void logException(String message, Throwable exception) {
+        ILog logger = getLog();
+        logger.log(new Status(IStatus.ERROR, ID, message, exception));
+    }
 }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java
index b8f262f26..b8f262f26 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/builder/ViatraQueryProjectBuilder.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/builder/ViatraQueryProjectBuilder.java
index b070989c8..b070989c8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/builder/ViatraQueryProjectBuilder.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/builder/ViatraQueryProjectBuilder.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/FileStringReplacer.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/FileStringReplacer.java
index 574a325fe..574a325fe 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/FileStringReplacer.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/FileStringReplacer.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigrator.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigrator.xtend
index f1f728bbf..f1f728bbf 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigrator.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigrator.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigratorData.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigratorData.xtend
index 3c0fe86fa..3c0fe86fa 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigratorData.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigratorData.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigrateProjectHandler.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigrateProjectHandler.java
index 9b1cf53d4..9b1cf53d4 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigrateProjectHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigrateProjectHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorConstants.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorConstants.java
index 854be3901..854be3901 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorConstants.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorConstants.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorPlugin.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorPlugin.java
index 0415598c4..0415598c4 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorPlugin.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorPlugin.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/NatureUpdaterJob.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/NatureUpdaterJob.java
index 0bcbc544f..2a4629144 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/NatureUpdaterJob.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/NatureUpdaterJob.java
@@ -28,9 +28,9 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.pde.internal.core.natures.PDE;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.tooling.core.project.ProjectGenerationHelper;
 import org.eclipse.viatra.query.tooling.core.project.ViatraQueryNature;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 import org.eclipse.viatra.query.tooling.ui.migrator.MigratorConstants;
 import org.eclipse.xtext.builder.EclipseOutputConfigurationProvider;
 import org.eclipse.xtext.ui.XtextProjectHelper;
@@ -201,7 +201,7 @@ class NatureUpdaterJob extends Job {
             }
             project.build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
         } catch (CoreException e) {
-            return new Status(IStatus.ERROR, ViatraQueryGUIPlugin.PLUGIN_ID, "Error updating project natures", e);
+            return new Status(IStatus.ERROR, EMFPatternLanguageUIPlugin.ID, "Error updating project natures", e);
         }
         return Status.OK_STATUS;
     }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java
index 55ed18403..55ed18403 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/properties/QueryProjectVersionTester.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/properties/QueryProjectVersionTester.java
index fe7a0760e..fe7a0760e 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/properties/QueryProjectVersionTester.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/properties/QueryProjectVersionTester.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/perspective/TransformationDevelopmentPerspective.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/perspective/TransformationDevelopmentPerspective.java
index 7c59aedc7..7c59aedc7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/perspective/TransformationDevelopmentPerspective.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/perspective/TransformationDevelopmentPerspective.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/RootPreferencePage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/RootPreferencePage.java
index f9b938398..f9b938398 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/RootPreferencePage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/RootPreferencePage.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/ToolingCorePreferencePage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/ToolingCorePreferencePage.java
index f2f298516..f2f298516 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/ToolingCorePreferencePage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/preferences/ToolingCorePreferencePage.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/AbstractBackendSelectionControl.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/AbstractBackendSelectionControl.java
index a5662f7c9..a5662f7c9 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/AbstractBackendSelectionControl.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/AbstractBackendSelectionControl.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/adapters/VQLEditorModelConnector.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/adapters/VQLEditorModelConnector.java
index f7aaef468..f7aaef468 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/adapters/VQLEditorModelConnector.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/adapters/VQLEditorModelConnector.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
index 1f3227a0c..6cc494f14 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 
 public class PatternInitializationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
@@ -53,7 +53,7 @@ public class PatternInitializationPreferencePage extends PreferencePage implemen
 
     @Override
     protected Control createContents(Composite parent) {
-        final IPreferenceStore store = ViatraQueryGUIPlugin.getDefault().getPreferenceStore();
+        final IPreferenceStore store = EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore();
         Composite control = new Composite(parent, SWT.NONE);
         
         Label wildcardDescriptionLabel = new Label(control, SWT.NONE | SWT.WRAP);
@@ -65,7 +65,7 @@ public class PatternInitializationPreferencePage extends PreferencePage implemen
         wildcardDescriptionLabel.setLayoutData(layoutData);
         final BooleanFieldEditor wildcardModeEditor = new BooleanFieldEditor(PreferenceConstants.WILDCARD_MODE,
                 "&Wildcard mode", control);
-        wildcardModeEditor.setPreferenceStore(ViatraQueryGUIPlugin.getDefault().getPreferenceStore());
+        wildcardModeEditor.setPreferenceStore(EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore());
         wildcardModeEditor.load();
         wildcardModeEditor.setPropertyChangeListener(event -> store.setValue(PreferenceConstants.WILDCARD_MODE, wildcardModeEditor.getBooleanValue()));
         
@@ -75,7 +75,7 @@ public class PatternInitializationPreferencePage extends PreferencePage implemen
         dynamicEMFDescriptionLabel.setLayoutData(layoutData);
         final BooleanFieldEditor dynamicEMFModeEditor = new BooleanFieldEditor(PreferenceConstants.DYNAMIC_EMF_MODE,
                 "&Dynamic EMF mode", control);
-        dynamicEMFModeEditor.setPreferenceStore(ViatraQueryGUIPlugin.getDefault().getPreferenceStore());
+        dynamicEMFModeEditor.setPreferenceStore(EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore());
         dynamicEMFModeEditor.load();
         dynamicEMFModeEditor.setPropertyChangeListener(event -> store.setValue(PreferenceConstants.DYNAMIC_EMF_MODE, dynamicEMFModeEditor.getBooleanValue()));
         
@@ -87,7 +87,7 @@ public class PatternInitializationPreferencePage extends PreferencePage implemen
         dredDescriptionLabel.setLayoutData(layoutData);
         final BooleanFieldEditor dredModeEditor = new BooleanFieldEditor(PreferenceConstants.DRED_MODE,
                 "&Delete-and-Rederive (DRed) mode", control);
-        dredModeEditor.setPreferenceStore(ViatraQueryGUIPlugin.getDefault().getPreferenceStore());
+        dredModeEditor.setPreferenceStore(EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore());
         dredModeEditor.load();
         dredModeEditor.setPropertyChangeListener(event -> store.setValue(PreferenceConstants.DRED_MODE, dredModeEditor.getBooleanValue()));
         
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PreferenceConstants.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PreferenceConstants.java
index e6181c3a7..e6181c3a7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PreferenceConstants.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/PreferenceConstants.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/RuntimePreferencesInterpreter.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/RuntimePreferencesInterpreter.java
index c48697699..81a9c3f2b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/RuntimePreferencesInterpreter.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/preference/RuntimePreferencesInterpreter.java
@@ -13,6 +13,7 @@ package org.eclipse.viatra.query.tooling.ui.queryexplorer.preference;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
 import org.eclipse.viatra.query.runtime.base.api.BaseIndexOptions;
 import org.eclipse.viatra.query.runtime.base.api.IndexingLevel;
@@ -20,7 +21,6 @@ import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryHintOption;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint.BackendRequirement;
 import org.eclipse.viatra.query.runtime.rete.util.ReteHintOptions;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 
 /**
  * @author Gabor Bergmann
@@ -37,7 +37,7 @@ public class RuntimePreferencesInterpreter {
     public static QueryEvaluationHint getHintOverridesFromPreferences() {
         Map<QueryHintOption<?>, Object> hintSettings = new HashMap<>();
 
-        boolean dredMode = ViatraQueryGUIPlugin.getDefault().getPreferenceStore()
+        boolean dredMode = EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore()
                 .getBoolean(PreferenceConstants.DRED_MODE);
         ReteHintOptions.deleteRederiveEvaluation.insertValueIfNondefault(hintSettings, dredMode);
         
@@ -60,10 +60,10 @@ public class RuntimePreferencesInterpreter {
      * @return the BaseIndexOptions specified on the preferences page
      */
     public static BaseIndexOptions getBaseIndexOptionsFromPreferences() {
-        boolean wildcardMode = ViatraQueryGUIPlugin.getDefault().getPreferenceStore()
+        boolean wildcardMode = EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore()
                 .getBoolean(PreferenceConstants.WILDCARD_MODE);
         IndexingLevel wildcardLevel = wildcardMode ? IndexingLevel.FULL : IndexingLevel.NONE;
-        boolean dynamicEMFMode = ViatraQueryGUIPlugin.getDefault().getPreferenceStore()
+        boolean dynamicEMFMode = EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore()
                 .getBoolean(PreferenceConstants.DYNAMIC_EMF_MODE);
         BaseIndexOptions options = new BaseIndexOptions(dynamicEMFMode, wildcardLevel);
         return options;
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/util/CommandConstants.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/util/CommandConstants.java
index 1f8987426..1f8987426 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/util/CommandConstants.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryexplorer/util/CommandConstants.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend
index a8e10e64a..a8e10e64a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
index 8582815d1..2f8869fed 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
@@ -11,8 +11,6 @@ package org.eclipse.viatra.query.tooling.ui.queryregistry
 
 import com.google.common.collect.Maps
 import java.util.Map
-import org.eclipse.core.runtime.IStatus
-import org.eclipse.core.runtime.Status
 import org.eclipse.jface.viewers.TreePath
 import org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistry
 import org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryChangeListener
@@ -22,7 +20,7 @@ import org.eclipse.viatra.query.runtime.registry.view.AbstractRegistryView
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.eclipse.xtend.lib.annotations.Data
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 
 /** 
  * @author Abel Hegedus
@@ -176,8 +174,7 @@ class QueryRegistryTreeEntry {
                 return true
             } catch (Exception ex) {
                 val logMessage = String.format("Query Registry has encountered an error during loading of query %s: %s", entry.fullyQualifiedName, ex.message)
-                ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(
-                        IStatus.ERROR, ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, ex));
+                EMFPatternLanguageUIPlugin.instance.logException(logMessage, ex)
             }
         }
         return false
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend
index cf8f0d6f0..2c7d7b009 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend
@@ -16,7 +16,7 @@ import org.eclipse.viatra.query.runtime.ui.ViatraQueryRuntimeUIPlugin
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.XtextIndexBasedRegistryUpdater
 import org.eclipse.core.resources.ResourcesPlugin
 import org.eclipse.core.resources.IProject
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 
 class QueryRegistryTreeLabelProvider extends ColumnLabelProvider {
     
@@ -27,7 +27,7 @@ class QueryRegistryTreeLabelProvider extends ColumnLabelProvider {
     }
 
     dispatch def Image getImageInternal(QueryRegistryTreeEntry element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_VQL)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_VQL)
     }
     
     dispatch def Image getImageInternal(QueryRegistryTreeSource element) {
@@ -35,14 +35,14 @@ class QueryRegistryTreeLabelProvider extends ColumnLabelProvider {
         if (sourceId.startsWith(XtextIndexBasedRegistryUpdater.DYNAMIC_CONNECTOR_ID_PREFIX)) {
             val member = ResourcesPlugin.workspace.root.findMember(sourceId.replace(XtextIndexBasedRegistryUpdater.DYNAMIC_CONNECTOR_ID_PREFIX, ""))
             if (member instanceof IProject) {                
-                return imageRegistry.get(ViatraQueryGUIPlugin.ICON_PROJECT)
+                return imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_PROJECT)
             }
         } 
-        return imageRegistry.get(ViatraQueryGUIPlugin.ICON_ROOT)
+        return imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_ROOT)
     }
     
     dispatch def Image getImageInternal(QueryRegistryTreePackage element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_EPACKAGE)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_EPACKAGE)
     }
     
     dispatch def Image getImageInternal(Object element) {
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java
index cde57f758..9896d9827 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java
@@ -42,8 +42,8 @@ import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.runtime.registry.QuerySpecificationRegistry;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.XtextIndexBasedRegistryUpdater;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.XtextIndexBasedRegistryUpdaterFactory;
 import org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadQueriesHandler;
@@ -189,8 +189,7 @@ public class QueryRegistryView extends ViewPart implements ITabbedPropertySheetP
                 updater.connectIndexToRegistry(QuerySpecificationRegistry.getInstance());
             } catch (InterruptedException e) {
                 String logMessage = "Error while resetting Query Registry: " + e.getMessage();
-                ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
-                        ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, e));
+                EMFPatternLanguageUIPlugin.getInstance().logException(logMessage, e);
                 // Maintaining interrupted state
                 Thread.currentThread().interrupt();
             }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java
index 0649ed7f8..0649ed7f8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java
index 7daf5b03f..7daf5b03f 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java
index a686a4273..a686a4273 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java
index 426c70d9c..426c70d9c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend
index 1228aadef..1228aadef 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java
index 6258454b0..6258454b0 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java
index 485b8956e..485b8956e 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend
index a838ebcc7..a838ebcc7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java
index 47c7903a2..47c7903a2 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java
index f30728b3b..f30728b3b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend
index 6e13073d8..6e13073d8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend
index 4507f420c..4507f420c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend
index d9f1a21d8..0aed26a53 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend
@@ -19,8 +19,6 @@ import com.google.common.collect.Table
 import com.google.common.collect.TreeMultimap
 import java.util.Map
 import java.util.Set
-import org.eclipse.core.runtime.IStatus
-import org.eclipse.core.runtime.Status
 import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder
 import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine
 import org.eclipse.viatra.query.runtime.api.IPatternMatch
@@ -52,7 +50,7 @@ import org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherCollection
 import org.eclipse.viatra.query.runtime.ui.modelconnector.IModelConnector
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery.PQueryStatus
 import org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.RuntimePreferencesInterpreter
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 
 /**
  * @author Abel Hegedus
@@ -273,8 +271,7 @@ class QueryResultTreeInput implements IFilteredMatcherCollection {
         ]
         if(knownErrorEntries.put(entry.sourceIdentifier, entryFQN)){
             val logMessage = String.format("Query Explorer has encountered an error during evaluation of query %s: %s", entryFQN, ex.message)
-            ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(
-                    IStatus.ERROR, ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, ex));
+            EMFPatternLanguageUIPlugin.instance.logException(logMessage, ex)
         }
         return treeMatcher
     }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend
index 81d8caa16..86e4efe1f 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend
@@ -14,16 +14,15 @@ import org.eclipse.jface.viewers.ColumnLabelProvider
 import org.eclipse.swt.graphics.Image
 import org.eclipse.viatra.query.runtime.api.IPatternMatch
 import org.eclipse.viatra.query.runtime.emf.helper.ViatraQueryRuntimeHelper
-import org.eclipse.viatra.query.runtime.ui.ViatraQueryRuntimeUIPlugin
 import org.eclipse.viatra.query.tooling.ui.queryresult.util.QueryResultViewUtil
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 
 /**
  * @author Abel Hegedus
  */
 package class QueryResultTreeLabelProvider extends ColumnLabelProvider {
     
-    val imageRegistry = ViatraQueryRuntimeUIPlugin.getDefault().getImageRegistry()
+    val imageRegistry = EMFPatternLanguageUIPlugin.getInstance().getImageRegistry()
     AdapterFactoryLabelProvider adapterFactoryLabelProvider
     static val String QUERY_EXPLORER_ANNOTATION = "QueryExplorer";
     static val String LABEL_ANNOTATION = "Label";
@@ -38,19 +37,19 @@ package class QueryResultTreeLabelProvider extends ColumnLabelProvider {
     }
     
     dispatch def Image getImageInternal(QueryResultTreeInput element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_ROOT)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_ROOT)
     }
 
     dispatch def Image getImageInternal(QueryResultTreeMatcher<?> element) {
         if(element.exception !== null){
-            imageRegistry.get(ViatraQueryGUIPlugin.ICON_ERROR)
+            imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_ERROR)
         } else {
-            imageRegistry.get(ViatraQueryGUIPlugin.ICON_MATCHER)
+            imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_MATCHER)
         }
     }
 
     dispatch def Image getImageInternal(IPatternMatch element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_MATCH)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_MATCH)
     }
     
     dispatch def Image getImageInternal(Object element) {
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java
index 71e64c582..fa216fefd 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java
@@ -48,6 +48,7 @@ import org.eclipse.ui.services.IEvaluationService;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.api.IModelConnectorTypeEnum;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
@@ -60,7 +61,6 @@ import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory;
 import org.eclipse.viatra.query.runtime.ui.modelconnector.EMFModelConnector;
 import org.eclipse.viatra.query.runtime.ui.modelconnector.IModelConnector;
 import org.eclipse.viatra.query.runtime.ui.modelconnector.IModelConnectorListener;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 import org.eclipse.viatra.query.tooling.ui.queryexplorer.util.CommandConstants;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.XtextIndexBasedRegistryUpdater;
@@ -410,8 +410,7 @@ public class QueryResultView extends ViewPart {
             contentLoaderJob.join();
         } catch (InterruptedException e) {
             String msg = "Error while stopping loading queries: " + e.getMessage();
-            ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
-                    ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), msg, e));
+            EMFPatternLanguageUIPlugin.getInstance().logException(msg, e);
             
          // Maintaining interrupted state
             Thread.currentThread().interrupt();
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java
index 848feb2b1..848feb2b1 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend
index 516a6cdc7..516a6cdc7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend
index 9786c6591..9786c6591 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend
index d0d4a3fc1..d0d4a3fc1 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend
index 952312f8b..ba358bb96 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend
@@ -23,7 +23,7 @@ import org.eclipse.viatra.query.tooling.ui.queryresult.util.ViatraQueryEngineLab
 import org.eclipse.ui.dialogs.ISelectionStatusValidator
 import org.eclipse.core.runtime.IStatus
 import org.eclipse.core.runtime.Status
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 
 /** 
  * @author Abel Hegedus
@@ -56,9 +56,9 @@ class OpenManagedEngineHandler extends AbstractHandler {
         engineSelectionDialog.validator = new ISelectionStatusValidator() {
             override validate(Object[] selection) {
                 if (selection.size == 1 && selection.filter(AdvancedViatraQueryEngine).size == 1){
-                    return new Status(IStatus.OK, ViatraQueryGUIPlugin.PLUGIN_ID, 0, "", null)
+                    return new Status(IStatus.OK, EMFPatternLanguageUIPlugin.ID, 0, "", null)
                 } else {
-                    return new Status(IStatus.ERROR, ViatraQueryGUIPlugin.PLUGIN_ID, 0, "", null)
+                    return new Status(IStatus.ERROR, EMFPatternLanguageUIPlugin.ID, 0, "", null)
                 }
             }
         }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend
index e8d668be7..e8d668be7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend
index 646525259..646525259 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend
index 1867f76e3..1867f76e3 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend
index 842f2ec39..842f2ec39 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend
index e1c754772..e1c754772 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java
index 3d854e30a..3d854e30a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend
index 4914d0398..4914d0398 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend
index 0beb23448..0beb23448 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend
index 0a95ef477..0a95ef477 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java
index c2a8aafc9..c2a8aafc9 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java
index 38fe19023..38fe19023 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java
index e3e5f0b2d..e3e5f0b2d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java
index e92307596..e92307596 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend
index 130364ae7..130364ae7 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend
index 2d99f0310..2d99f0310 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend
index cf288f64c..cf288f64c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend
index a55f3ce07..a0c08551b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend
@@ -19,7 +19,7 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions
 import org.eclipse.viatra.query.runtime.base.api.BaseIndexOptions
 import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin
 
 /**
  * @author Abel Hegedus
@@ -27,8 +27,7 @@ import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
  */
 class ViatraQueryEngineLabelProvider extends LabelProvider {
 
-    val imageRegistry = ViatraQueryGUIPlugin.getDefault().getImageRegistry()
-    val browserImageRegistry = ViatraQueryGUIPlugin.getDefault().getImageRegistry()
+    val imageRegistry = EMFPatternLanguageUIPlugin.getInstance().getImageRegistry()
     AdapterFactoryLabelProvider adapterFactoryLabelProvider
     
     new() {
@@ -41,27 +40,27 @@ class ViatraQueryEngineLabelProvider extends LabelProvider {
     }
     
     dispatch def getImageInternal(ViatraQueryEngine element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_VIATRA)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_VIATRA)
     }
     
     dispatch def getImageInternal(BaseIndexOptions element) {
-        browserImageRegistry.get(ViatraQueryGUIPlugin.ICON_BASE_OPTIONS)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_BASE_OPTIONS)
     }
     
     dispatch def getImageInternal(ViatraQueryEngineOptions element) {
-        browserImageRegistry.get(ViatraQueryGUIPlugin.ICON_ENGINE_OPTIONS)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_ENGINE_OPTIONS)
     }
     
     dispatch def getImageInternal(IQueryBackendFactory element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_VQL)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_VQL)
     }
     
     dispatch def getImageInternal(QueryEvaluationHint element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_VQL)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_VQL)
     }
     
     dispatch def getImageInternal(EngineError element) {
-        imageRegistry.get(ViatraQueryGUIPlugin.ICON_ERROR)
+        imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_ERROR)
     }
     
     dispatch def getImageInternal(Entry<String,Object> element) {
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/registry/QueryBackendRegistry.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/registry/QueryBackendRegistry.java
index 049ac6e41..049ac6e41 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/registry/QueryBackendRegistry.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/registry/QueryBackendRegistry.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/CommandInvokingDoubleClickListener.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/CommandInvokingDoubleClickListener.java
index 4e54a64f5..4e54a64f5 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/CommandInvokingDoubleClickListener.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/CommandInvokingDoubleClickListener.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherCollection.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherCollection.java
index 6eed95aae..6eed95aae 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherCollection.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherCollection.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherContent.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherContent.java
index 2b687b6c5..2b687b6c5 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherContent.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/IFilteredMatcherContent.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/IModelConnectorListener.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/IModelConnectorListener.java
index dbdf7418a..dbdf7418a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/util/IModelConnectorListener.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/util/IModelConnectorListener.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewGenmodelWizard.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewGenmodelWizard.java
index 976bfc723..976bfc723 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewGenmodelWizard.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewGenmodelWizard.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewProjectWizard.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewProjectWizard.java
index feb9b2526..feb9b2526 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewProjectWizard.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewProjectWizard.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVQGenmodelPage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVQGenmodelPage.java
index b34add365..b34add365 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVQGenmodelPage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVQGenmodelPage.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizard.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizard.java
index 270b14971..3b749e726 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizard.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizard.java
@@ -38,6 +38,7 @@ import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.patternlanguage.emf.vql.ClassType;
 import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternLanguageFactory;
 import org.eclipse.viatra.query.patternlanguage.emf.vql.PackageImport;
@@ -47,7 +48,6 @@ import org.eclipse.viatra.query.patternlanguage.emf.vql.Modifiers;
 import org.eclipse.viatra.query.patternlanguage.emf.vql.Parameter;
 import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern;
 import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternBody;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 import org.eclipse.viatra.query.tooling.ui.wizards.internal.ObjectParameter;
 
 import com.google.inject.Inject;
@@ -124,7 +124,7 @@ public class NewVqlFileWizard extends Wizard implements INewWizard {
             return false;
         } catch (InvocationTargetException e) {
             Throwable realException = e.getTargetException();
-            ViatraQueryGUIPlugin.getDefault().logException(
+            EMFPatternLanguageUIPlugin.getInstance().logException(
                     "Cannot create Query Definition file: " + realException.getMessage(), realException);
             MessageDialog.openError(getShell(), "Error", realException.getMessage());
             return false;
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardContainerConfigurationPage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardContainerConfigurationPage.java
index 2711b1101..e443da0f2 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardContainerConfigurationPage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardContainerConfigurationPage.java
@@ -38,7 +38,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 
 /**
  * First page of the {@link NewVqlFileWizard} which allows to specify the details of the container for a pattern.
@@ -188,7 +188,7 @@ public class NewVqlFileWizardContainerConfigurationPage extends NewTypeWizardPag
 
     private IStatus validatePackageName(String text) {
         if (text == null || text.isEmpty()) {
-            return new Status(IStatus.ERROR, ViatraQueryGUIPlugin.PLUGIN_ID, DEFAULT_PACKAGE_ERROR);
+            return new Status(IStatus.ERROR, EMFPatternLanguageUIPlugin.ID, DEFAULT_PACKAGE_ERROR);
         }
         IJavaProject project = getJavaProject();
         if (project == null || !project.exists()) {
@@ -196,7 +196,7 @@ public class NewVqlFileWizardContainerConfigurationPage extends NewTypeWizardPag
         }
         IStatus status = JavaConventionsUtil.validatePackageName(text, project);
         if (!Objects.equals(text, text.toLowerCase())) {
-            return new Status(IStatus.ERROR, ViatraQueryGUIPlugin.PLUGIN_ID, PACKAGE_NAME_WARNING);
+            return new Status(IStatus.ERROR, EMFPatternLanguageUIPlugin.ID, PACKAGE_NAME_WARNING);
         }
         return status;
     }
@@ -233,7 +233,7 @@ public class NewVqlFileWizardContainerConfigurationPage extends NewTypeWizardPag
             try {
                 root.createPackageFragment(getPackageText(), true, new NullProgressMonitor());
             } catch (JavaModelException e) {
-                ViatraQueryGUIPlugin.getDefault().logException("Cannot load packages " + e.getMessage(), e);
+                EMFPatternLanguageUIPlugin.getInstance().logException("Cannot load packages " + e.getMessage(), e);
             }
         }
 
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardPatternConfigurationPage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardPatternConfigurationPage.java
index d05203ba9..d05203ba9 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardPatternConfigurationPage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/NewVqlFileWizardPatternConfigurationPage.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/SelectViatraQueryProjectPage.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/SelectViatraQueryProjectPage.java
index 3bb5f926d..3bb5f926d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/SelectViatraQueryProjectPage.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/SelectViatraQueryProjectPage.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialog.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialog.java
index a1fc94737..a1fc94737 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialog.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialog.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java
index e9759ac29..e9759ac29 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListAdapter.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListAdapter.java
index 6fcd6f2ab..6fcd6f2ab 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListAdapter.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListAdapter.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListLabelProvider.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListLabelProvider.java
index 77cc927e2..9a37c8a02 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListLabelProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ImportListLabelProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 
 /**
  * {@link ILabelProvider} implementation for the {@link ImportListAdapter}.
@@ -30,12 +30,12 @@ public class ImportListLabelProvider extends StyledCellLabelProvider implements
     private ImageRegistry imageRegistry;
 
     public ImportListLabelProvider() {
-        imageRegistry = ViatraQueryGUIPlugin.getDefault().getImageRegistry();
+        imageRegistry = EMFPatternLanguageUIPlugin.getInstance().getImageRegistry();
     }
 
     @Override
     public Image getImage(Object element) {
-        return imageRegistry.get(ViatraQueryGUIPlugin.ICON_EPACKAGE);
+        return imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_EPACKAGE);
     }
 
     @Override
@@ -53,7 +53,7 @@ public class ImportListLabelProvider extends StyledCellLabelProvider implements
 //            if (ePackage.eResource() != null && ePackage.eResource().getURI().isPlatform()) {
 //                text.append(String.format(" (%s)", ePackage.eResource().getURI()), StyledString.QUALIFIER_STYLER);
 //            }
-            cell.setImage(imageRegistry.get(ViatraQueryGUIPlugin.ICON_EPACKAGE));
+            cell.setImage(imageRegistry.get(EMFPatternLanguageUIPlugin.ICON_EPACKAGE));
         }
         cell.setText(text.getString());
         cell.setStyleRanges(text.getStyleRanges());
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListAdapter.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListAdapter.java
index 1d2445b3b..1d2445b3b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListAdapter.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListAdapter.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListLabelProvider.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListLabelProvider.java
index 47e366dd3..47e366dd3 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListLabelProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectListLabelProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameter.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameter.java
index 33e8fd2b3..33e8fd2b3 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameter.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameter.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java
index 0c5c20a73..0c5c20a73 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
index abdb608ef..abdb608ef 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
index 42564e38d..42564e38d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java
index d66b61a8a..49dc71b2e 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java
@@ -24,12 +24,12 @@ import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.tooling.core.generator.genmodel.IVQGenmodelProvider;
 import org.eclipse.viatra.query.tooling.core.project.ViatraQueryNature;
 import org.eclipse.viatra.query.tooling.generator.model.generatorModel.GeneratorModelFactory;
 import org.eclipse.viatra.query.tooling.generator.model.generatorModel.GeneratorModelReference;
 import org.eclipse.viatra.query.tooling.generator.model.generatorModel.ViatraQueryGeneratorModel;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 import org.eclipse.xtext.ui.resource.IResourceSetProvider;
 import org.eclipse.xtext.util.StringInputStream;
 
@@ -65,7 +65,7 @@ public class CreateGenmodelOperation extends WorkspaceModifyOperation {
                 genmodelProvider.saveGeneratorModel(project, generatorModel);
             }
         } catch (IOException e) {
-            throw new CoreException(new Status(IStatus.ERROR, ViatraQueryGUIPlugin.PLUGIN_ID,
+            throw new CoreException(new Status(IStatus.ERROR, EMFPatternLanguageUIPlugin.ID,
                     "Cannot create generator model: " + e.getMessage(), e));
         }
     }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateProjectOperation.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateProjectOperation.java
index f152cefd0..f152cefd0 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateProjectOperation.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/CreateProjectOperation.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java
index 08763e59c..08763e59c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/xtend-gen/.gitignore b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/xtend-gen/.gitignore
index 1a5126b18..1a5126b18 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/xtend-gen/.gitignore
+++ b/query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/xtend-gen/.gitignore
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF
index 10fc590ff..b505e9baf 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.debug.ui,
  org.eclipse.jdt.debug.ui,
  org.eclipse.jdt.ui,
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.core.expressions,
  org.eclipse.viatra.integration.zest;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.gef.layout;bundle-version="5.0.0",
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/plugin.xml
index 3fb232633..29cf0a524 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/plugin.xml
+++ b/query/plugins/org.eclipse.viatra.query.tooling.localsearch.ui/plugin.xml
@@ -6,7 +6,7 @@
       <view
             category="org.eclipse.viatra.query.tooling.ui"
             class="org.eclipse.viatra.query.tooling.localsearch.ui.debugger.views.LocalSearchDebugView"
-            icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+            icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png"
             id="org.eclipse.viatra.query.tooling.localsearch.ui.LocalSearchDebugView"
             name="Local Search Debugger"
             restorable="true">
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF
index a5f560cbc..5130b2f30 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Export-Package: org.eclipse.viatra.query.tooling.ui.retevis
 Require-Bundle: org.eclipse.viatra.query.runtime.rete.recipes;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.query.runtime;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.gef.zest.fx;bundle-version="5.0.0",
  org.eclipse.gef.zest.fx.jface;bundle-version="5.0.0",
@@ -20,6 +19,7 @@ Require-Bundle: org.eclipse.viatra.query.runtime.rete.recipes;bundle-version="[2
  org.eclipse.gef.fx.swt;bundle-version="5.0.0",
  org.eclipse.gef.layout;bundle-version="5.0.0",
  org.eclipse.viatra.query.patternlanguage.emf;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.query.runtime.rete;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.integration.zest;bundle-version="[2.1.0,2.2.0)",
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/plugin.xml
index c35571690..d3b9da059 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/plugin.xml
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.4"?><plugin>
   <extension point="org.eclipse.ui.views">
-    <view category="org.eclipse.viatra.query.tooling.ui" class="org.eclipse.viatra.query.tooling.ui.retevis.views.ReteVisualizationView" icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png" id="org.eclipse.viatra.query.tooling.ui.retevis.views.ReteVisualizer" name="Rete Visualizer"/>
+    <view category="org.eclipse.viatra.query.tooling.ui" class="org.eclipse.viatra.query.tooling.ui.retevis.views.ReteVisualizationView" icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png" id="org.eclipse.viatra.query.tooling.ui.retevis.views.ReteVisualizer" name="Rete Visualizer"/>
   </extension>
   <extension point="org.eclipse.ui.preferencePages">
     <page category="org.eclipse.viatra.query.tooling.ui.viatra" class="org.eclipse.viatra.query.tooling.ui.retevis.preference.ReteVisualizationPreferencePage" id="org.eclipse.viatra.query.tooling.ui.retevis" name="Rete Visualization">
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/preference/ReteVisualizationPreferencePage.java b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/preference/ReteVisualizationPreferencePage.java
index 5baf275d9..0bff7439b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/preference/ReteVisualizationPreferencePage.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/preference/ReteVisualizationPreferencePage.java
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 
 /**
  * @author Abel Hegedus
@@ -37,7 +37,7 @@ public class ReteVisualizationPreferencePage extends PreferencePage implements I
 
     @Override
     protected Control createContents(Composite parent) {
-        final IPreferenceStore store = ViatraQueryGUIPlugin.getDefault().getPreferenceStore();
+        final IPreferenceStore store = EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore();
         Composite control = new Composite(parent, SWT.NONE);
         
         Label traverseSubPatternCallDescriptionLabel = new Label(control, SWT.NONE | SWT.WRAP);
@@ -49,7 +49,7 @@ public class ReteVisualizationPreferencePage extends PreferencePage implements I
         traverseSubPatternCallDescriptionLabel.setLayoutData(layoutData);
         final BooleanFieldEditor traverseSubpatternCallModeEditor = new BooleanFieldEditor(ReteVisualizationPreferenceConstants.DISPLAY_CALLED_NETWORKS_MODE,
                 "&Display networks for called patterns", control);
-        traverseSubpatternCallModeEditor.setPreferenceStore(ViatraQueryGUIPlugin.getDefault().getPreferenceStore());
+        traverseSubpatternCallModeEditor.setPreferenceStore(EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore());
         traverseSubpatternCallModeEditor.load();
         traverseSubpatternCallModeEditor.setPropertyChangeListener(event -> store.setValue(ReteVisualizationPreferenceConstants.DISPLAY_CALLED_NETWORKS_MODE, traverseSubpatternCallModeEditor.getBooleanValue()));
         
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/views/ReteVisualizationViewSupport.java b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/views/ReteVisualizationViewSupport.java
index b7c664a18..120dddb1d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/views/ReteVisualizationViewSupport.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui.retevis/src/org/eclipse/viatra/query/tooling/ui/retevis/views/ReteVisualizationViewSupport.java
@@ -33,6 +33,7 @@ import org.eclipse.viatra.addon.viewers.runtime.model.ViewerState.ViewerStateFea
 import org.eclipse.viatra.addon.viewers.runtime.zest.extensions.ViatraViewersZestViewSupport;
 import org.eclipse.viatra.addon.viewers.runtime.zest.sources.ZestContentProvider;
 import org.eclipse.viatra.integration.zest.viewer.ModifiableZestContentViewer;
+import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageUIPlugin;
 import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.api.IModelConnectorTypeEnum;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
@@ -50,7 +51,6 @@ import org.eclipse.viatra.query.runtime.rete.recipes.ProductionRecipe;
 import org.eclipse.viatra.query.runtime.rete.recipes.ReteNodeRecipe;
 import org.eclipse.viatra.query.runtime.rete.recipes.SingleParentNodeRecipe;
 import org.eclipse.viatra.query.runtime.rete.traceability.RecipeTraceInfo;
-import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
 import org.eclipse.viatra.query.tooling.ui.retevis.preference.ReteVisualizationPreferenceConstants;
 import org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherContent;
 
@@ -207,7 +207,7 @@ public class ReteVisualizationViewSupport extends ViatraViewersZestViewSupport {
             nextParentsToCollect.add(rightParent);
         } else if (recipe instanceof MultiParentNodeRecipe) {
             boolean isProductionRecipe = recipe instanceof ProductionRecipe;
-            boolean traverseSubpatternCallMode = ViatraQueryGUIPlugin.getDefault().getPreferenceStore()
+            boolean traverseSubpatternCallMode = EMFPatternLanguageUIPlugin.getInstance().getPreferenceStore()
                     .getBoolean(ReteVisualizationPreferenceConstants.DISPLAY_CALLED_NETWORKS_MODE);
             boolean traverseProductionRecipe = isRootRecipe || traverseSubpatternCallMode;
             if (!isProductionRecipe || traverseProductionRecipe) {
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.classpath b/query/plugins/org.eclipse.viatra.query.tooling.ui/.classpath
deleted file mode 100644
index 213e409f9..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.jatlas-settings/noIndex b/query/plugins/org.eclipse.viatra.query.tooling.ui/.jatlas-settings/noIndex
deleted file mode 100644
index e69de29bb..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.jatlas-settings/noIndex
+++ /dev/null
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.project b/query/plugins/org.eclipse.viatra.query.tooling.ui/.project
deleted file mode 100644
index d7fe68766..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.viatra.query.tooling.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.core.resources.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 07afae2ac..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Feb 17 16:14:18 CET 2012
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.jdt.core.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.jdt.ui.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c00a7ad91..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.javadoc=true
-
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.sonarlint.eclipse.core.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.sonarlint.eclipse.core.prefs
deleted file mode 100644
index 63e99eae5..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.settings/org.sonarlint.eclipse.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-autoEnabled=true
-eclipse.preferences.version=1
-extraProperties=
-moduleKey=org.eclipse.viatra\:org.eclipse.viatra.query.tooling.ui
-projectKey=org.eclipse.viatra\:org.eclipse.viatra.parent.all
-serverId=build
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 592192e18..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,53 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: VIATRA Query IDE - User Interface
-Bundle-SymbolicName: org.eclipse.viatra.query.tooling.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Vendor: Eclipse VIATRA Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.5.0",
- org.eclipse.ui.cheatsheets,
- org.eclipse.core.expressions,
- org.eclipse.emf.common;bundle-version="2.7.0",
- org.eclipse.emf.ecore;bundle-version="2.7.0",
- org.eclipse.jface.databinding,
- org.eclipse.emf.edit;bundle-version="2.7.1",
- org.eclipse.xtext.ui;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.viatra.query.tooling.core;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.runtime;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.patternlanguage.emf;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.core.databinding.beans;bundle-version="1.2.100",
- org.eclipse.emf.ecore.editor;bundle-version="2.7.0",
- org.eclipse.ui.forms,
- org.eclipse.core.databinding,
- org.eclipse.core.databinding.property,
- com.ibm.icu,
- org.eclipse.emf.codegen.ecore,
- org.eclipse.viatra.query.tooling.generator.model;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.xtext.builder;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.viatra.query.runtime.rete;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.runtime.ui;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.transformation.evm;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.xtend.lib,
- org.eclipse.pde.core;bundle-version="3.7.0"
-Bundle-Activator: org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.viatra.query.tooling.ui,
- org.eclipse.viatra.query.tooling.ui.queryexplorer,
- org.eclipse.viatra.query.tooling.ui.queryexplorer.adapters,
- org.eclipse.viatra.query.tooling.ui.queryexplorer.preference,
- org.eclipse.viatra.query.tooling.ui.queryexplorer.util,
- org.eclipse.viatra.query.tooling.ui.queryregistry.index;x-friends:="org.eclipse.viatra.query.patternlanguage.emf.sirius",
- org.eclipse.viatra.query.tooling.ui.queryresult;x-friends:="org.eclipse.viatra.query.patternlanguage.emf.sirius",
- org.eclipse.viatra.query.tooling.ui.util
-Import-Package: org.apache.log4j;version="1.2.15"
-Automatic-Module-Name: org.eclipse.viatra.query.tooling.ui
-
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/about.html b/query/plugins/org.eclipse.viatra.query.tooling.ui/about.html
deleted file mode 100644
index d8e198403..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/about.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/build.properties b/query/plugins/org.eclipse.viatra.query.tooling.ui/build.properties
deleted file mode 100644
index 02ca468f8..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/,\
-           xtend-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               cheatsheets/,\
-               icons/,\
-               about.html
-src.includes = about.html
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
deleted file mode 100644
index bec589da1..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
+++ /dev/null
@@ -1,984 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            id="org.eclipse.viatra.query.tooling.ui.category"
-            name="VIATRA">
-      </category>
-      <wizard
-            category="org.eclipse.viatra.query.tooling.ui.category"
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.wizards.NewProjectWizard"
-            finalPerspective="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
-            icon="icons/logo2.png"
-            id="org.eclipse.viatra.query.tooling.ui.newproject"
-            name="Query Project"
-            preferredPerspectives="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective,org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective"
-            project="true">
-      </wizard>
-      <wizard
-            category="org.eclipse.viatra.query.tooling.ui.category"
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.wizards.NewVqlFileWizard"
-            finalPerspective="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
-            icon="icons/logo2.png"
-            id="org.eclipse.viatra.query.tooling.ui.newvqlfile"
-            name="Query Definition "
-            preferredPerspectives="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective,org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective">
-      </wizard>
-      <wizard
-            category="org.eclipse.viatra.query.tooling.ui.category"
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.wizards.NewGenmodelWizard"
-            icon="icons/logo2.png"
-            id="org.eclipse.viatra.query.tooling.ui.newvqlgenmodel"
-            name="Query Generator Model"
-            project="false">
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-      <category
-            id="org.eclipse.viatra"
-            name="VIATRA">
-      </category>
-      <cheatsheet
-            category="org.eclipse.viatra"
-            composite="true"
-            contentFile="cheatsheets/gettingstarted.xml"
-            id="org.eclipse.viatra.query.tooling.ui.cheatsheet"
-            name="Getting Started with VIATRA Query">
-      </cheatsheet>
-   </extension>
-<extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.viatra.query.tooling.ui"
-            name="VIATRA">
-      </category>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <newWizardShortcut
-               id="org.eclipse.viatra.query.tooling.ui.newvqlfile">
-         </newWizardShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.pde.ui.PDEPerspective">
-         <newWizardShortcut
-               id="org.eclipse.viatra.query.tooling.ui.newvqlfile">
-         </newWizardShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
-         <view
-               id="org.eclipse.jdt.ui.TypeHierarchy"
-               minimized="false"
-               visible="false"
-               relationship="stack"
-               relative="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-         <view
-               id="org.eclipse.jdt.ui.PackageExplorer"
-               minimized="false"
-               visible="false"
-               relationship="stack"
-               relative="org.eclipse.ui.navigator.ProjectExplorer">
-         </view>
-         <view
-               id="org.eclipse.ui.views.PropertySheet"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.ProblemView">
-         </view>
-         <view
-               id="org.eclipse.amalgam.explorer.contextual.ui.view.ExplorerContextualID"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.PropertySheet">
-         </view>
-         <view
-               id="org.eclipse.ui.console.ConsoleView"
-               minimized="false"
-               visible="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.PropertySheet">
-         </view>
-         <view
-               id="org.eclipse.ui.views.BookmarkView"
-               minimized="false"
-               visible="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.PropertySheet">
-         </view>
-         <view
-               id="org.eclipse.ui.views.ProgressView"
-               minimized="false"
-               visible="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.PropertySheet">
-         </view>
-         <viewShortcut
-               id="org.eclipse.ui.views.PropertySheet">
-         </viewShortcut>
-         <viewShortcut
-               id="org.eclipse.ui.views.ProblemView">
-         </viewShortcut>
-         <viewShortcut
-               id="org.eclipse.jdt.ui.PackageExplorer">
-         </viewShortcut>
-         <newWizardShortcut
-               id="org.eclipse.viatra.query.tooling.ui.newproject">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.viatra.query.tooling.ui.newvqlfile">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.viatra.query.tooling.ui.newvqlgenmodel">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.xtend.ide.wizards.NewXtendClassWizard">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.xtend.ide.wizards.NewXtendInterfaceWizard">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.pde.ui.NewProjectWizard">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.ui.wizards.new.folder">
-         </newWizardShortcut>
-         <newWizardShortcut
-               id="org.eclipse.ui.wizards.new.file">
-         </newWizardShortcut>
-         <actionSet
-               id="org.eclipse.debug.ui.launchActionSet">
-         </actionSet>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.definitions">
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.vql.file">
-         <with
-               variable="selection">
-            <iterate
-                  ifEmpty="false">
-               <adapt
-                     type="org.eclipse.core.resources.IFile">
-                  <test
-                        property="org.eclipse.core.resources.name"
-                        value="*.vql">
-                  </test>
-               </adapt>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.activepatterneditor">
-         <with
-               variable="activeEditorId">
-            <equals
-                  value="org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage">
-            </equals>
-         </with>
-      </definition>
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.filteredmatchercontent">
-            <with
-               variable="selection">
-            <iterate
-                  ifEmpty="false">
-               <instanceof
-                     value="org.eclipse.viatra.query.tooling.ui.util.IFilteredMatcherContent">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.loadmodel"
-            name="Load model">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.showlocation"
-            name="Show location">
-      </command>
-      <category
-            description="Commands related to VIATRA"
-            id="org.eclipse.viatra.query.tooling.category"
-            name="VIATRA">
-      </category>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.showlocation_patternreg"
-            name="Show location">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.viatra.query.tooling.ui.viatra"
-            class="org.eclipse.viatra.query.tooling.ui.queryexplorer.preference.PatternInitializationPreferencePage"
-            id="org.eclipse.viatra.query.tooling.ui.queryexplorer"
-            name="Query Explorer">
-         <keywordReference
-               id="org.eclipse.viatra.query.patternlanguage.emf.ui.keyword_EMFPatternLanguage">
-         </keywordReference>
-      </page>
-      <page
-            class="org.eclipse.viatra.query.tooling.ui.preferences.RootPreferencePage"
-            id="org.eclipse.viatra.query.tooling.ui.viatra"
-            name="VIATRA">
-      </page>
-      <page
-            category="org.eclipse.viatra.query.tooling.ui.viatra"
-            class="org.eclipse.viatra.query.tooling.ui.preferences.ToolingCorePreferencePage"
-            id="org.eclipse.viatra.query.tooling.ui.preferences.ToolingCorePreferencePage"
-            name="Query Tooling">
-         <keywordReference
-               id="org.eclipse.viatra.query.patternlanguage.emf.ui.keyword_EMFPatternLanguage">
-         </keywordReference>
-      </page>
-   </extension>
-   <extension
-         id="org.eclipse.viatra.query.tooling.ui.projectbuilder"
-         name="VIATRA Query Project Builder"
-         point="org.eclipse.core.resources.builders">
-      <builder
-            hasNature="true">
-         <run
-               class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory">
-               <parameter name="guicekey" value="org.eclipse.viatra.query.tooling.ui.builder.ViatraQueryProjectBuilder"/>
-         </run></builder>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            class="org.eclipse.viatra.query.tooling.ui.perspective.TransformationDevelopmentPerspective"
-            icon="icons/rsz_viatra_logo.png"
-            id="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective"
-            name="Transformation Development">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.navigator.navigatorContent">
-      <commonWizard
-            menuGroupId="org.eclipse.viatra"
-            type="new"
-            wizardId="org.eclipse.viatra.query.tooling.ui.newproject">
-         <enablement>
-            <with
-                  variable="activeWorkbenchWindow.activePerspective">
-               <equals
-                     value="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
-               </equals>
-            </with></enablement>
-      </commonWizard>
-      <commonWizard
-            menuGroupId="org.eclipse.viatra"
-            type="new"
-            wizardId="org.eclipse.viatra.query.tooling.ui.newvqlfile">
-         <enablement>
-            <with
-                  variable="activeWorkbenchWindow.activePerspective">
-               <equals
-                     value="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
-               </equals>
-            </with></enablement>
-      </commonWizard>
-   </extension>
-<extension
-         point="org.eclipse.ui.views">
-      <view
-            category="org.eclipse.viatra.query.tooling.ui"
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView"
-            icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-            id="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView"
-            name="Query Registry">
-      </view>
-      <view
-            category="org.eclipse.viatra.query.tooling.ui"
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
-            icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-            id="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
-            name="Query Results">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.viatra.query.tooling.ui.TransformationDevPerspective">
-         <view
-               id="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView"
-               minimized="false"
-               relationship="stack"
-               relative="left">
-         </view>
-         <view
-               id="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
-               minimized="false"
-               relationship="stack"
-               relative="right">
-         </view>
-         <viewShortcut
-               id="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         </viewShortcut>
-         <viewShortcut
-               id="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
-         </viewShortcut>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.queryregistry.handlers.ResetViewHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.registry.reset">
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryregistry.handlers.ShowLocationHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.showlocation">
-         <activeWhen>
-            <reference
-                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
-            </reference>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadResourceSetHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.loadmodel">
-         <enabledWhen>
-           <reference
-                 definitionId="org.eclipse.viatra.query.runtime.ui.activedomaineditor">
-           </reference>
-         </enabledWhen>
-         <activeWhen>
-            <not>
-               <reference
-                     definitionId="org.eclipse.viatra.query.tooling.ui.activepatterneditor">
-               </reference>
-            </not>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadVqlPatternHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.loadvqlqueries">
-         <activeWhen>
-            <reference
-                 definitionId="org.eclipse.viatra.query.tooling.ui.activepatterneditor">
-            </reference>
-         </activeWhen>
-         <enabledWhen>
-            <with
-                  variable="activeEditor">
-               <test
-                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
-               </test>
-            </with>
-         </enabledWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.LoadQueriesHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.loadqueries">
-         <activeWhen>
-            <reference
-              definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registrycontent">
-            </reference>
-         </activeWhen>
-         <enabledWhen>
-            <with
-                  variable="activePart">
-               <test
-                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
-               </test>
-            </with>
-         </enabledWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.UnloadModelHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.unloadmodel">
-         <enabledWhen>
-            <with
-                  variable="activePart">
-               <instanceof
-                     value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
-               </instanceof>
-               <test
-                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
-               </test>
-            </with>
-         </enabledWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.WipeEngineHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.wipeengine">
-         <enabledWhen>
-            <with
-                  variable="activePart">
-               <instanceof
-                     value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
-               </instanceof>
-               <test
-                     property="org.eclipse.viatra.query.tooling.ui.browser.result.activeengine">
-               </test>
-            </with>
-         </enabledWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryregistry.handlers.ShowLocationHandler"
-            commandId="org.eclipse.jdt.ui.edit.text.java.open.editor">
-         <activeWhen>
-            <reference
-                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
-            </reference>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.ShowMatcherLocationHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.showlocation">
-         <activeWhen>
-            <reference
-                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatcher">
-            </reference>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.ShowMatchLocationHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.showlocation">
-         <activeWhen>
-            <with
-                  variable="selection">
-               <iterate
-                     ifEmpty="false">
-                  <or>
-                     <instanceof
-                           value="org.eclipse.emf.ecore.EObject">
-                     </instanceof>
-                     <instanceof
-                           value="org.eclipse.viatra.query.runtime.api.IPatternMatch">
-                     </instanceof>
-                  </or>
-               </iterate>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.RemoveQueryHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.removequery">
-         <activeWhen>
-            <reference
-                  definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatchers">
-            </reference>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.QueryLanguageExecutableExtensionFactory:org.eclipse.viatra.query.tooling.ui.queryresult.handlers.OpenManagedEngineHandler"
-            commandId="org.eclipse.viatra.query.tooling.ui.result.openmanaged">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.registry.reset"
-               icon="platform:/plugin/org.eclipse.jdt.ui/icons/full/elcl16/refresh.png"
-               label="Reset view"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.showlocation"
-               icon="platform:/plugin/org.eclipse.ui.ide/icons/full/elcl16/gotoobj_tsk.png"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                        definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.loadqueries"
-               icon="icons/load_query.png"
-               id="org.eclipse.viatra.query.tooling.ui.result.loadqueriesmenu"
-               label="Load into Query Results"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.registrycontent">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="toolbar:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
-         <control
-               class="org.eclipse.viatra.query.tooling.ui.queryresult.BackendSelectionControl">
-         </control>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.loadmodel"
-               icon="icons/load_model.png"
-               id="org.eclipse.viatra.query.tooling.ui.result.loadmodelmenu"
-               label="Load model from active editor"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.loadvqlqueries"
-               icon="icons/load_query.png"
-               label="Load queries from active editor"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.navigate.collapseAll"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.unloadmodel"
-               icon="platform:/plugin/org.eclipse.ui/icons/full/elcl16/stop.png"
-               label="Unload model"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.wipeengine"
-               icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete_edit.png"
-               label="Remove loaded queries"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.openmanaged"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Open managed engine"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="toolbar:org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         <command
-               commandId="org.eclipse.ui.navigate.collapseAll"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView">
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.showlocation"
-               icon="platform:/plugin/org.eclipse.ui.ide/icons/full/elcl16/gotoobj_tsk.png"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultcontent">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.ui.result.removequery"
-               icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete_edit.png"
-               label="Remove query"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatchers">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.registry.reset"
-            name="Reset view">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.loadmodel"
-            name="Load model from active editor">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.openmanaged"
-            name="Open managed engine">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.loadvqlqueries"
-            name="Load queries from active editor">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.loadqueries"
-            name="Load into Query Results">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.unloadmodel"
-            name="Unload model">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.wipeengine"
-            name="Remove loaded queries">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.ui.result.removequery"
-            name="Remove query">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-      <propertyContributor
-            contributorId="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         <propertyCategory
-               category="org.eclipse.viatra.query.tooling.ui.propertiesCategory">
-         </propertyCategory>
-      </propertyContributor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-      <propertyContributor
-            contributorId="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultView"
-            tabDescriptorProvider="org.eclipse.viatra.query.tooling.ui.queryresult.properties.QueryResultTreeTabDescriptorProvider">
-         <propertyCategory
-               category="org.eclipse.viatra.query.tooling.ui.result.propertiesCategory">
-         </propertyCategory>
-      </propertyContributor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-      <propertyTabs
-            contributorId="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         <propertyTab
-               category="org.eclipse.viatra.query.tooling.ui.propertiesCategory"
-               id="org.eclipse.viatra.query.tooling.ui.properties.specification"
-               label="Query">
-         </propertyTab>
-         <propertyTab
-               afterTab="org.eclipse.viatra.query.tooling.ui.properties.specification"
-               category="org.eclipse.viatra.query.tooling.ui.propertiesCategory"
-               id="org.eclipse.viatra.query.tooling.ui.properties.specification.advanced"
-               indented="true"
-               label="Advanced">
-         </propertyTab>
-      </propertyTabs>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertySections">
-      <propertySections
-            contributorId="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryView">
-         <propertySection
-               class="org.eclipse.viatra.query.tooling.ui.queryregistry.properties.QuerySpecificationPropertySection"
-               enablesFor="1"
-               id="org.eclipse.viatra.query.tooling.ui.properties.specification.section"
-               tab="org.eclipse.viatra.query.tooling.ui.properties.specification">
-            <input
-                  type="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
-            </input>
-         </propertySection>
-         <propertySection
-               class="org.eclipse.ui.views.properties.tabbed.AdvancedPropertySection"
-               enablesFor="1"
-               id="org.eclipse.ui.views.properties.tabbed.AdvancedPropertySection"
-               tab="org.eclipse.viatra.query.tooling.ui.properties.specification.advanced">
-            <input
-                  type="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
-            </input>
-         </propertySection>
-      </propertySections>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.adapters">
-      <factory
-            adaptableType="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry"
-            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.views.properties.IPropertySource">
-         </adapter>
-      </factory>
-      <factory
-            adaptableType="org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryEntry"
-            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.views.properties.IPropertySource">
-         </adapter>
-      </factory>
-      <factory
-            adaptableType="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher"
-            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.views.properties.IPropertySource">
-         </adapter>
-      </factory>
-      <factory
-            adaptableType="org.eclipse.viatra.query.runtime.api.IPatternMatch"
-            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.views.properties.IPropertySource">
-         </adapter>
-      </factory>
-      <factory
-            adaptableType="org.eclipse.emf.ecore.EObject"
-            class="org.eclipse.viatra.query.tooling.ui.browser.QueryBrowserAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.views.properties.IPropertySource">
-         </adapter>
-      </factory>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.definitions">
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.browser.selection.registryentry">
-        <with
-           variable="selection">
-        <and>
-              <count
-                    value="1">
-              </count>
-              <iterate>
-                 <instanceof
-                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
-                 </instanceof>
-              </iterate>
-           </and>
-        </with>
-      </definition>
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.browser.selection.registrycontent">
-        <with
-              variable="selection">
-           <iterate
-                 ifEmpty="false">
-              <or>
-                 <instanceof
-                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeSource">
-                 </instanceof>
-                 <instanceof
-                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreePackage">
-                 </instanceof>
-                 <instanceof
-                       value="org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry">
-                 </instanceof>
-              </or>
-           </iterate>
-        </with>
-      </definition>
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.browser.selection.resultcontent">
-         <with
-               variable="selection">
-            <iterate
-                  ifEmpty="false">
-               <or>
-                  <instanceof
-                        value="org.eclipse.emf.ecore.EObject">
-                  </instanceof>
-                  <instanceof
-                        value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher">
-                  </instanceof>
-                  <instanceof
-                        value="org.eclipse.viatra.query.runtime.api.IPatternMatch">
-                  </instanceof>
-               </or>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatcher">
-         <with
-               variable="selection">
-            <and>
-               <count
-                     value="1">
-               </count>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher">
-                  </instanceof>
-               </iterate>
-            </and>
-         </with>
-      </definition>
-      <definition
-            id="org.eclipse.viatra.query.tooling.ui.browser.selection.resultmatchers">
-         <with
-               variable="selection">
-            <and>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.viatra.query.tooling.ui.queryresult.QueryResultTreeMatcher">
-                  </instanceof>
-               </iterate>
-            </and>
-         </with>
-      </definition>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.viatra.query.tooling.ui.queryresult.internal.ActiveEnginePropertyTester"
-            id="org.eclipse.viatra.query.tooling.ui.browser.result"
-            namespace="org.eclipse.viatra.query.tooling.ui.browser.result"
-            properties="activeengine"
-            type="java.lang.Object">
-      </propertyTester>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.migrator.api.command"
-            name="Migrate IncQuery API to VIATRA Queries">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.migrator.metadata.command"
-            name="Add VIATRA Query Nature">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.ui.projectConfigure?after=additions">
-         <command
-               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Update Query Project"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate>
-                  <adapt
-                           type="org.eclipse.core.resources.IProject">
-                     <and>
-                        <test
-                              property="org.eclipse.core.resources.open"
-                              value="true">
-                        </test>
-                        <test
-                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
-                        </test>
-                        <test
-                              property="org.eclipse.core.resources.projectNature"
-                              value="org.eclipse.incquery.projectnature">
-                        </test>
-                     </and>
-                  </adapt>
-               </iterate>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Convert to VIATRA Query Project"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate>
-                  <adapt
-                           type="org.eclipse.core.resources.IProject">
-                     <and>
-                        <test
-                              property="org.eclipse.core.resources.open"
-                              value="true">
-                        </test>
-                        <test
-                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
-                        </test>
-                        <not>
-                           <test
-                                 property="org.eclipse.core.resources.projectNature"
-                                 value="org.eclipse.incquery.projectnature">
-                           </test>
-                        </not>
-                     </and>
-                  </adapt>
-               </iterate>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.migrator.api.command"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Replace EMF-IncQuery API Usage"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate>
-                  <adapt
-                        type="org.eclipse.core.resources.IProject">
-                     <and>
-                        <test
-                              property="org.eclipse.core.resources.open"
-                              value="true">
-                        </test>
-                        <test
-                              property="org.eclipse.core.resources.projectNature"
-                              value="org.eclipse.jdt.core.javanature">
-                        </test>
-                        <not>
-                           <and>
-                              <test
-                                    property="org.eclipse.viatra.query.tooling.migrator.outdated">
-                              </test>
-                              <test
-                                    property="org.eclipse.core.resources.projectNature"
-                                    value="org.eclipse.viatra.query.projectnature">
-                              </test>
-                           </and>
-                        </not>
-                     </and>
-                  </adapt>
-               </iterate>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:org.eclipse.viatra.migrator.metadata.ProjectNatureUpdater"
-            commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command">
-      </handler>
-      <handler
-            class="org.eclipse.viatra.query.tooling.ui.migrator.MigrateProjectHandler"
-            commandId="org.eclipse.viatra.query.tooling.migrator.api.command">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.viatra.query.tooling.ui.migrator.properties.QueryProjectVersionTester"
-            id="org.eclipse.viatra.query.tooling.migrator.projectPropertyTester"
-            namespace="org.eclipse.viatra.query.tooling.migrator"
-            properties="outdated"
-            type="org.eclipse.core.resources.IProject">
-      </propertyTester>
-   </extension>
-</plugin>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/pom.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui/pom.xml
deleted file mode 100644
index fd6bf3f18..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-        <artifactId>org.eclipse.viatra.parent.all</artifactId>
-        <groupId>org.eclipse.viatra</groupId>
-        <version>2.1.0-SNAPSHOT</version>
-        <relativePath>../../../releng/org.eclipse.viatra.parent.all/pom.xml</relativePath>
-    </parent>
-  <artifactId>org.eclipse.viatra.query.tooling.ui</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
-                <executions>
-                    <execution>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>xtend-gen</directory>
-                                    <excludes>
-                                        <exclude>.gitignore</exclude>
-                                    </excludes>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-                <version>${xtend.compiler.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/QueryLanguageExecutableExtensionFactory.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/QueryLanguageExecutableExtensionFactory.java
deleted file mode 100644
index 5218b378c..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/QueryLanguageExecutableExtensionFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010-2012, Zoltan Ujhelyi, Tamas Szabo, Istvan Rath and Daniel Varro
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.viatra.query.tooling.ui;
-
-import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory;
-import org.osgi.framework.Bundle;
-
-public class QueryLanguageExecutableExtensionFactory extends EMFPatternLanguageExecutableExtensionFactory {
-
-    @Override
-    protected Bundle getBundle() {
-        return ViatraQueryGUIPlugin.getDefault().getBundle();
-    }
-
-}
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/ViatraQueryGUIPlugin.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/ViatraQueryGUIPlugin.java
deleted file mode 100644
index 84a988330..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/ViatraQueryGUIPlugin.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010-2012, Zoltan Ujhelyi, Tamas Szabo, Istvan Rath and Daniel Varro
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.viatra.query.tooling.ui;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ViatraQueryGUIPlugin extends AbstractUIPlugin {
-
-    /**
-     * The plug-in ID
-     */
-    public static final String PLUGIN_ID = "org.eclipse.viatra.query.tooling.ui";
-
-    public static final String ICON_ROOT = "navigator_root";
-    public static final String ICON_MATCHER = "matcher";
-    public static final String ICON_MATCH = "match";
-    public static final String ICON_ERROR = "error";
-    public static final String ICON_ARROW_RIGHT = "arrow_right";
-    public static final String ICON_ARROW_LEFT = "arrow_left";
-    public static final String ICON_PIN = "pin";
-    public static final String ICON_ARROW_TOP = "arrow_top";
-    public static final String ICON_ARROW_BOTTOM = "arrow_bottom";
-    public static final String ICON_EPACKAGE = "epackage";
-    public static final String ICON_VQL = "vql";
-    /**
-     * @since 1.3
-     */
-    public static final String ICON_PROJECT = "project";
-    /**
-     * @since 1.4
-     */
-    public static final String ICON_VIATRA = "viatra";
-    /**
-     * @since 2.1
-     */
-    public static final String ICON_BASE_OPTIONS = "base_options";
-    /**
-     * @since 2.1
-     */
-    public static final String ICON_ENGINE_OPTIONS = "engine_options";
-
-    // The shared instance
-    private static ViatraQueryGUIPlugin plugin;
-
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static ViatraQueryGUIPlugin getDefault() {
-        return plugin;
-    }
-
-    @Override
-    protected void initializeImageRegistry(ImageRegistry reg) {
-        super.initializeImageRegistry(reg);
-        reg.put(ICON_ROOT, imageDescriptorFromPlugin(JavaUI.ID_PLUGIN, "icons/full/eview16/types.png"));
-        reg.put(ICON_MATCHER, imageDescriptorFromPlugin("org.eclipse.debug.ui", "icons/full/eview16/breakpoint_view.png"));
-        reg.put(ICON_MATCH, imageDescriptorFromPlugin(JavaUI.ID_PLUGIN, "icons/full/obj16/methpub_obj.png"));
-        reg.put(ICON_ERROR, imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID, "icons/full/progress/errorstate.png"));
-        reg.put(ICON_PIN, imageDescriptorFromPlugin(PLUGIN_ID, "icons/pin.gif"));
-        reg.put(ICON_ARROW_RIGHT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/arrow_right.gif"));
-        reg.put(ICON_ARROW_LEFT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/arrow_left.gif"));
-        reg.put(ICON_ARROW_TOP, imageDescriptorFromPlugin(PLUGIN_ID, "icons/arrow_top.gif"));
-        reg.put(ICON_ARROW_BOTTOM, imageDescriptorFromPlugin(PLUGIN_ID, "icons/arrow_bottom.gif"));
-        reg.put(ICON_EPACKAGE, imageDescriptorFromPlugin(PLUGIN_ID, "icons/epackage.gif"));
-        reg.put(ICON_VQL, imageDescriptorFromPlugin(PLUGIN_ID, "icons/logo2.png"));
-        reg.put(ICON_VIATRA, imageDescriptorFromPlugin(PLUGIN_ID, "icons/rsz_viatra_logo.png"));
-        reg.put(ICON_PROJECT, imageDescriptorFromPlugin("org.eclipse.ui.ide", "icons/full/obj16/prj_obj.png"));
-        reg.put(ICON_BASE_OPTIONS, imageDescriptorFromPlugin(PLUGIN_ID, "icons/base_options.png"));
-        reg.put(ICON_ENGINE_OPTIONS, imageDescriptorFromPlugin(PLUGIN_ID, "icons/engine_options.png"));
-    }
-
-    public void logException(String message, Throwable exception) {
-        ILog logger = getLog();
-        logger.log(new Status(IStatus.ERROR, PLUGIN_ID, message, exception));
-    }
-}
diff --git a/query/tests/org.eclipse.viatra.query.testing.ui/META-INF/MANIFEST.MF b/query/tests/org.eclipse.viatra.query.testing.ui/META-INF/MANIFEST.MF
index dca9b079b..c292e3dea 100644
--- a/query/tests/org.eclipse.viatra.query.testing.ui/META-INF/MANIFEST.MF
+++ b/query/tests/org.eclipse.viatra.query.testing.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.viatra.query.testing.ui;singleton:=true
 Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.viatra.query.testing.ui.ViatraQueryTestingUIPlugin
 Require-Bundle: org.eclipse.ui,
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.query.testing.core;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.xtext.ui;bundle-version="[2.12.0,3.0.0)",
diff --git a/query/tests/org.eclipse.viatra.query.testing.ui/plugin.xml b/query/tests/org.eclipse.viatra.query.testing.ui/plugin.xml
index 31839af6d..768e3676a 100644
--- a/query/tests/org.eclipse.viatra.query.testing.ui/plugin.xml
+++ b/query/tests/org.eclipse.viatra.query.testing.ui/plugin.xml
@@ -55,7 +55,7 @@
       <wizard
             category="org.eclipse.viatra.query.tooling.ui.category"
             class="org.eclipse.viatra.query.testing.ui.wizards.SnapshotModelWizard"
-            icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+            icon="platform:/plugin/org.eclipse.viatra.query.patternlanguage.emf.ui/icons/logo2.png"
             id="org.eclipse.viatra.query.testing.snapshot.presentation.SnapshotModelWizardID"
             name="Query Snapshot">
          <description>
diff --git a/releng/org.eclipse.viatra.parent.all/pom.xml b/releng/org.eclipse.viatra.parent.all/pom.xml
index 74ecfa35a..fb1451abc 100644
--- a/releng/org.eclipse.viatra.parent.all/pom.xml
+++ b/releng/org.eclipse.viatra.parent.all/pom.xml
@@ -19,7 +19,6 @@
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.generator.model</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.generator.model.ui</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.core</module>
-		<module>../../query/plugins/org.eclipse.viatra.query.tooling.ui</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.debug</module>
 		<module>../../query/tests/org.eclipse.viatra.query.patternlanguage.emf.tests</module>
 		<module>../../query/tests/org.eclipse.viatra.query.patternlanguage.emf.ui.tests</module>