[533848] Merges query.tooling.ui and query.tooling.ui.browser plugins

Change-Id: I3320571a32af72c55a6f2143c1c715f73b522e48

78 files changed, 635 insertions, 856 deletions

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 8b12aca43..8601eb258 100644
--- a/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
+++ b/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
@@ -133,13 +133,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.viatra.query.tooling.ui.browser"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.viatra.documentation.help"
          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 5a13256b8..94d371719 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
@@ -35,7 +35,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.browser;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.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.tooling.ui.browser/.classpath b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.classpath
deleted file mode 100644
index 213e409f9..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.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.browser/.project b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.project
deleted file mode 100644
index 06894debb..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.viatra.query.tooling.ui.browser</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</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>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.settings/org.eclipse.core.resources.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 07afae2ac..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.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.browser/.settings/org.eclipse.jdt.core.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.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.browser/.settings/org.eclipse.jdt.ui.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c00a7ad91..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.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.browser/.settings/org.sonarlint.eclipse.core.prefs b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.settings/org.sonarlint.eclipse.core.prefs
deleted file mode 100644
index 661b646e5..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/.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.browser
-projectKey=org.eclipse.viatra\:org.eclipse.viatra.parent.all
-serverId=build
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/META-INF/MANIFEST.MF
deleted file mode 100644
index a2629ea5c..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: VIATRA Query IDE - Browser
-Bundle-SymbolicName: org.eclipse.viatra.query.tooling.ui.browser;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.core.expressions,
- org.eclipse.emf.common;bundle-version="2.7.0",
- org.eclipse.emf.ecore;bundle-version="2.7.0",
- org.eclipse.emf.edit;bundle-version="2.7.1",
- org.eclipse.viatra.query.runtime;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.query.patternlanguage.emf.ui;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.runtime.ui;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.ui.forms,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.xtend.lib;bundle-version="[2.12.0,3.0.0)",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.xtext.ui;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.viatra.transformation.evm;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.xtext.common.types;bundle-version="[2.12.0,3.0.0)"
-Bundle-Activator: org.eclipse.viatra.query.tooling.ui.browser.ViatraQueryToolingBrowserPlugin
-Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.log4j;version="1.2.15"
-Automatic-Module-Name: org.eclipse.viatra.query.tooling.ui.browser
-Export-Package: 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"
-
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/about.html b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/about.html
deleted file mode 100644
index d8e198403..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/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.browser/build.properties b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/build.properties
deleted file mode 100644
index ed2f72bb8..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/,\
-           xtend-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/
-src.includes = about.html
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/plugin.xml
deleted file mode 100644
index b8850c472..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/plugin.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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.browser.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>
-</plugin>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/pom.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/pom.xml
deleted file mode 100644
index 5abcffe38..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/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.browser</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.browser/src/org/eclipse/viatra/query/tooling/ui/browser/QueryLanguageExecutableExtensionFactory.java b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/QueryLanguageExecutableExtensionFactory.java
deleted file mode 100644
index 4f2150fc9..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/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.browser;
-
-import org.eclipse.viatra.query.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory;
-import org.osgi.framework.Bundle;
-
-public class QueryLanguageExecutableExtensionFactory extends EMFPatternLanguageExecutableExtensionFactory {
-
-    @Override
-    protected Bundle getBundle() {
-        return ViatraQueryToolingBrowserPlugin.getDefault().getBundle();
-    }
-
-}
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/ViatraQueryToolingBrowserPlugin.java b/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/ViatraQueryToolingBrowserPlugin.java
deleted file mode 100644
index 4ade9af0b..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/ViatraQueryToolingBrowserPlugin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010-2016, Abel Hegedus and IncQueryLabs Ltd.
- * 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:
- *   Abel Hegedus - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.query.tooling.ui.browser;
-
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class ViatraQueryToolingBrowserPlugin extends AbstractUIPlugin {
-
-    /**
-     * The plug-in ID
-     */
-    public static final String PLUGIN_ID = "org.eclipse.viatra.query.tooling.ui.browser";
-
-    public static final String ICON_BASE_OPTIONS = "base_options";
-    public static final String ICON_ENGINE_OPTIONS = "engine_options";
-    
-    
-    // The shared instance
-    private static ViatraQueryToolingBrowserPlugin 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 ViatraQueryToolingBrowserPlugin getDefault() {
-        return plugin;
-    }
-
-    @Override
-    protected void initializeImageRegistry(ImageRegistry reg) {
-        super.initializeImageRegistry(reg);
-        reg.put(ICON_BASE_OPTIONS, imageDescriptorFromPlugin(PLUGIN_ID, "icons/base_options.png"));
-        reg.put(ICON_ENGINE_OPTIONS, imageDescriptorFromPlugin(PLUGIN_ID, "icons/engine_options.png"));
-    }
-}
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.classpath b/query/plugins/org.eclipse.viatra.query.tooling.ui/.classpath
index 22f30643c..213e409f9 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.classpath
+++ b/query/plugins/org.eclipse.viatra.query.tooling.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 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"/>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/.project b/query/plugins/org.eclipse.viatra.query.tooling.ui/.project
index 7573c8ce9..d7fe68766 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/.project
+++ b/query/plugins/org.eclipse.viatra.query.tooling.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>
@@ -24,5 +29,6 @@
 	<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/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF
index 92bcdf3b7..3df2ca749 100644
--- 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
@@ -33,7 +33,10 @@ Require-Bundle: org.eclipse.ui,
  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.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
 Bundle-Activator: org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.viatra.query.tooling.ui,
@@ -41,6 +44,8 @@ Export-Package: org.eclipse.viatra.query.tooling.ui,
  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/build.properties b/query/plugins/org.eclipse.viatra.query.tooling.ui/build.properties
index a553abba0..02ca468f8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/build.properties
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/base_options.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options.png
index 2ad97a665..2ad97a665 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/base_options.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/base_options@1.5x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@1.5x.png
index b8ecc5b17..b8ecc5b17 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/base_options@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/base_options@2x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@2x.png
index a4369a196..a4369a196 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/base_options@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/base_options@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/engine_options.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options.png
index 4b179188d..4b179188d 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/engine_options.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/engine_options@1.5x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@1.5x.png
index 46da7f487..46da7f487 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/engine_options@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/engine_options@2x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@2x.png
index c74f1ddf2..c74f1ddf2 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/engine_options@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/engine_options@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_model.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model.png
index d1f20378c..d1f20378c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_model.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_model@1.5x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@1.5x.png
index 464449343..464449343 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_model@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_model@2x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@2x.png
index 55e01dd90..55e01dd90 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_model@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_model@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_query.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query.png
index 62c796821..62c796821 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_query.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_query@1.5x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@1.5x.png
index 5742c301e..5742c301e 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_query@1.5x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@1.5x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_query@2x.png b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@2x.png
index 37fd9872a..37fd9872a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/icons/load_query@2x.png
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/icons/load_query@2x.png
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
index 0b828d31e..a0862783f 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
@@ -299,4 +299,554 @@
             </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>
 </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
index aa3c62725..fd6bf3f18 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/pom.xml
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/pom.xml
@@ -10,4 +10,44 @@
     </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/ViatraQueryGUIPlugin.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/ViatraQueryGUIPlugin.java
index 47161704b..84a988330 100644
--- 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
@@ -49,6 +49,14 @@ public class ViatraQueryGUIPlugin extends AbstractUIPlugin {
      * @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;
@@ -90,6 +98,8 @@ public class ViatraQueryGUIPlugin extends AbstractUIPlugin {
         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) {
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java
index b8f262f26..b8f262f26 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/browser/QueryBrowserAdapterFactory.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend
index a8e10e64a..a8e10e64a 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeContentProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
index 6c9e524f7..8582815d1 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
@@ -19,11 +19,10 @@ import org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryChan
 import org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryEntry
 import org.eclipse.viatra.query.runtime.registry.IRegistryView
 import org.eclipse.viatra.query.runtime.registry.view.AbstractRegistryView
-import org.eclipse.viatra.query.runtime.ui.ViatraQueryRuntimeUIPlugin
-import org.eclipse.viatra.query.tooling.ui.browser.ViatraQueryToolingBrowserPlugin
 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
 
 /** 
  * @author Abel Hegedus
@@ -177,8 +176,8 @@ 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)
-                ViatraQueryToolingBrowserPlugin.getDefault().getLog().log(new Status(
-                        IStatus.ERROR, ViatraQueryRuntimeUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, ex));
+                ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(
+                        IStatus.ERROR, ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, ex));
             }
         }
         return false
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend
index cf8f0d6f0..cf8f0d6f0 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeLabelProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java
index fbd052568..cde57f758 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryView.java
@@ -43,7 +43,7 @@ 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.runtime.registry.QuerySpecificationRegistry;
-import org.eclipse.viatra.query.tooling.ui.browser.ViatraQueryToolingBrowserPlugin;
+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,8 @@ public class QueryRegistryView extends ViewPart implements ITabbedPropertySheetP
                 updater.connectIndexToRegistry(QuerySpecificationRegistry.getInstance());
             } catch (InterruptedException e) {
                 String logMessage = "Error while resetting Query Registry: " + e.getMessage();
-                ViatraQueryToolingBrowserPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
-                        ViatraQueryToolingBrowserPlugin.getDefault().getBundle().getSymbolicName(), logMessage, e));
+                ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
+                        ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, e));
                 // Maintaining interrupted state
                 Thread.currentThread().interrupt();
             }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ResetViewHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowLocationHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/handlers/ShowPatternLocationHandler.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/IPatternBasedSpecificationProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdater.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/index/XtextIndexBasedRegistryUpdaterFactory.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/IQuerySpecificationRegistryEntryPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/ParametersPropertySource.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QueryRegistryTreeEntryPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryregistry/properties/QuerySpecificationPropertySection.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend
index 6e13073d8..6e13073d8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/BackendSelectionControl.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend
index 4507f420c..4507f420c 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeContentProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend
index 50fcf4335..d9f1a21d8 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeInput.xtend
@@ -35,7 +35,6 @@ import org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryChan
 import org.eclipse.viatra.query.runtime.registry.IQuerySpecificationRegistryEntry
 import org.eclipse.viatra.query.runtime.registry.IRegistryView
 import org.eclipse.viatra.query.runtime.registry.view.AbstractRegistryView
-import org.eclipse.viatra.query.tooling.ui.browser.ViatraQueryToolingBrowserPlugin
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.IPatternBasedSpecificationProvider
 import org.eclipse.viatra.transformation.evm.api.ExecutionSchema
 import org.eclipse.viatra.transformation.evm.api.RuleSpecification
@@ -53,6 +52,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
 
 /**
  * @author Abel Hegedus
@@ -273,8 +273,8 @@ 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)
-            ViatraQueryToolingBrowserPlugin.getDefault().getLog().log(new Status(
-                    IStatus.ERROR, ViatraQueryToolingBrowserPlugin.getDefault().getBundle().getSymbolicName(), logMessage, ex));
+            ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(
+                    IStatus.ERROR, ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), logMessage, ex));
         }
         return treeMatcher
     }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend
index 81d8caa16..81d8caa16 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultTreeLabelProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java
index b9ec2181f..71e64c582 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultView.java
@@ -60,8 +60,8 @@ 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.browser.ViatraQueryToolingBrowserPlugin;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.QueryRegistryTreeEntry;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.XtextIndexBasedRegistryUpdater;
 import org.eclipse.viatra.query.tooling.ui.queryregistry.index.XtextIndexBasedRegistryUpdaterFactory;
@@ -410,8 +410,8 @@ public class QueryResultView extends ViewPart {
             contentLoaderJob.join();
         } catch (InterruptedException e) {
             String msg = "Error while stopping loading queries: " + e.getMessage();
-            ViatraQueryToolingBrowserPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
-                    ViatraQueryToolingBrowserPlugin.getDefault().getBundle().getSymbolicName(), msg, e));
+            ViatraQueryGUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
+                    ViatraQueryGUIPlugin.getDefault().getBundle().getSymbolicName(), msg, e));
             
          // Maintaining interrupted state
             Thread.currentThread().interrupt();
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java
index 848feb2b1..848feb2b1 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/QueryResultViewModel.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadQueriesHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadResourceSetHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/LoadVqlPatternHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend
index d71825f8c..952312f8b 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/OpenManagedEngineHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.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.browser.ViatraQueryToolingBrowserPlugin
+import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
 
 /** 
  * @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, ViatraQueryToolingBrowserPlugin.PLUGIN_ID, 0, "", null)
+                    return new Status(IStatus.OK, ViatraQueryGUIPlugin.PLUGIN_ID, 0, "", null)
                 } else {
-                    return new Status(IStatus.ERROR, ViatraQueryToolingBrowserPlugin.PLUGIN_ID, 0, "", null)
+                    return new Status(IStatus.ERROR, ViatraQueryGUIPlugin.PLUGIN_ID, 0, "", null)
                 }
             }
         }
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/RemoveQueryHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatchLocationHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/ShowMatcherLocationHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/UnloadModelHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/handlers/WipeEngineHandler.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/internal/ActiveEnginePropertyTester.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/HintsPropertySource.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatchParameterPropertyDescriptor.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/MatcherFiltersPropertySource.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatchPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeMatcherPropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/QueryResultTreeTabDescriptorProvider.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/properties/ValueWrapperAwarePropertySource.java
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/EngineError.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/QueryResultViewUtil.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend b/query/plugins/org.eclipse.viatra.query.tooling.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.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineContentProvider.xtend
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend
index c6cd7bd8b..a55f3ce07 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/queryresult/util/ViatraQueryEngineLabelProvider.xtend
@@ -19,8 +19,6 @@ 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.runtime.ui.ViatraQueryRuntimeUIPlugin
-import org.eclipse.viatra.query.tooling.ui.browser.ViatraQueryToolingBrowserPlugin
 import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
 
 /**
@@ -29,8 +27,8 @@ import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
  */
 class ViatraQueryEngineLabelProvider extends LabelProvider {
 
-    val imageRegistry = ViatraQueryRuntimeUIPlugin.getDefault().getImageRegistry()
-    val browserImageRegistry = ViatraQueryToolingBrowserPlugin.getDefault().getImageRegistry()
+    val imageRegistry = ViatraQueryGUIPlugin.getDefault().getImageRegistry()
+    val browserImageRegistry = ViatraQueryGUIPlugin.getDefault().getImageRegistry()
     AdapterFactoryLabelProvider adapterFactoryLabelProvider
     
     new() {
@@ -47,11 +45,11 @@ class ViatraQueryEngineLabelProvider extends LabelProvider {
     }
     
     dispatch def getImageInternal(BaseIndexOptions element) {
-        browserImageRegistry.get(ViatraQueryToolingBrowserPlugin.ICON_BASE_OPTIONS)
+        browserImageRegistry.get(ViatraQueryGUIPlugin.ICON_BASE_OPTIONS)
     }
     
     dispatch def getImageInternal(ViatraQueryEngineOptions element) {
-        browserImageRegistry.get(ViatraQueryToolingBrowserPlugin.ICON_ENGINE_OPTIONS)
+        browserImageRegistry.get(ViatraQueryGUIPlugin.ICON_ENGINE_OPTIONS)
     }
     
     dispatch def getImageInternal(IQueryBackendFactory element) {
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/xtend-gen/.gitignore b/query/plugins/org.eclipse.viatra.query.tooling.ui/xtend-gen/.gitignore
index 1a5126b18..1a5126b18 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui.browser/xtend-gen/.gitignore
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/xtend-gen/.gitignore
diff --git a/releng/org.eclipse.viatra.parent.all/pom.xml b/releng/org.eclipse.viatra.parent.all/pom.xml
index 472972c3b..d1fa7e9c3 100644
--- a/releng/org.eclipse.viatra.parent.all/pom.xml
+++ b/releng/org.eclipse.viatra.parent.all/pom.xml
@@ -20,7 +20,6 @@
 		<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.ui.browser</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.debug</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.migrator</module>
 		<module>../../query/tests/org.eclipse.viatra.query.patternlanguage.emf.tests</module>